Commit 8526d3f7 authored by Dmitry.Shahtanov's avatar Dmitry.Shahtanov Committed by Alexander.Trofimov

если showArrow == true не инициализируем ячейки

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@54244 954022d7-b5bf-4e40-9824-e11837661b57
parent e49da004
...@@ -741,14 +741,14 @@ ScrollObject.prototype = { ...@@ -741,14 +741,14 @@ ScrollObject.prototype = {
this.context.beginPath(); this.context.beginPath();
if ( this.isVerticalScroll ) { if ( this.isVerticalScroll ) {
var _y = this.ArrowDrawer.Size; var _y = this.settings.showArrows ? this.ArrowDrawer.Size : 0
var _h = this.canvasH - (_y << 1); var _h = this.canvasH - (_y << 1);
if ( _h > 0 ) if ( _h > 0 )
this.context.rect( 0, _y, this.canvasW, _h ); this.context.rect( 0, _y, this.canvasW, _h );
} }
else if ( this.isHorizontalScroll ) { else if ( this.isHorizontalScroll ) {
var _x = this.ArrowDrawer.Size; var _x = this.settings.showArrows ? this.ArrowDrawer.Size : 0;
var _w = this.canvasW - (_x << 1); var _w = this.canvasW - (_x << 1);
if ( _w > 0 ) if ( _w > 0 )
...@@ -760,23 +760,23 @@ ScrollObject.prototype = { ...@@ -760,23 +760,23 @@ ScrollObject.prototype = {
this.context.beginPath(); this.context.beginPath();
if ( this.isVerticalScroll && this.maxScrollY != 0 ) { if ( this.isVerticalScroll && this.maxScrollY != 0 ) {
var _y = this.scroller.y >> 0; var _y = this.scroller.y >> 0, arrow = this.settings.showArrows ? this.ArrowDrawer.Size : 0
if ( _y < this.ArrowDrawer.Size ) if ( _y < arrow )
_y = this.ArrowDrawer.Size; _y = arrow;
var _b = (this.scroller.y + this.scroller.h) >> 0; var _b = (this.scroller.y + this.scroller.h) >> 0;
if ( _b > (this.canvasH - this.ArrowDrawer.Size - 2) ) if ( _b > (this.canvasH - arrow - 2) )
_b = this.canvasH - this.ArrowDrawer.Size - 2; _b = this.canvasH - arrow - 2;
if ( _b > _y ) if ( _b > _y )
this.context.rect( 0.5, _y + 0.5, this.canvasW - 2, _b - _y + 1 ); this.context.rect( 0.5, _y + 0.5, this.canvasW - 2, _b - _y + 1 );
} }
else if ( this.isHorizontalScroll && this.maxScrollX != 0 ) { else if ( this.isHorizontalScroll && this.maxScrollX != 0 ) {
var _x = this.scroller.x >> 0; var _x = this.scroller.x >> 0, arrow = this.settings.showArrows ? this.ArrowDrawer.Size : 0
if ( _x < this.ArrowDrawer.Size ) if ( _x < arrow )
_x = this.ArrowDrawer.Size; _x = arrow;
var _r = (this.scroller.x + this.scroller.w) >> 0; var _r = (this.scroller.x + this.scroller.w) >> 0;
if ( _r > (this.canvasW - this.ArrowDrawer.Size - 2) ) if ( _r > (this.canvasW - arrow - 2) )
_r = this.canvasW - this.ArrowDrawer.Size - 2; _r = this.canvasW - arrow - 2;
if ( _r > _x ) if ( _r > _x )
this.context.rect( _x + 0.5, 0.5, _r - _x + 1, this.canvasH - 2 ); this.context.rect( _x + 0.5, 0.5, _r - _x + 1, this.canvasH - 2 );
...@@ -818,13 +818,13 @@ ScrollObject.prototype = { ...@@ -818,13 +818,13 @@ ScrollObject.prototype = {
if ( this.isVerticalScroll ) { if ( this.isVerticalScroll ) {
this.scroller.x = 0; this.scroller.x = 0;
this.scroller.w = this.canvasW - 1; this.scroller.w = this.canvasW - 1;
if ( this.settings.showArrows )
this.ArrowDrawer.InitSize( this.canvasW, this.IsRetina ); this.ArrowDrawer.InitSize( this.canvasW, this.IsRetina );
} }
else if ( this.isHorizontalScroll ) { else if ( this.isHorizontalScroll ) {
this.scroller.y = 0; this.scroller.y = 0;
this.scroller.h = this.canvasH - 1; this.scroller.h = this.canvasH - 1;
if ( this.settings.showArrows )
this.ArrowDrawer.InitSize( this.canvasH, this.IsRetina ); this.ArrowDrawer.InitSize( this.canvasH, this.IsRetina );
} }
}, },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment