Commit d476e193 authored by Dmitry.Vikulov's avatar Dmitry.Vikulov Committed by Alexander.Trofimov

Исправлен баг с увеличением строк/столбцов при перемещении объекта, если есть скролы

checkGraphicObjectPosition/* scrollOffset.getX() & scrollOffset.getY() */

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@51414 954022d7-b5bf-4e40-9824-e11837661b57
parent 725910dc
...@@ -4499,20 +4499,22 @@ function DrawingObjects() { ...@@ -4499,20 +4499,22 @@ function DrawingObjects() {
// выход за границу справа // выход за границу справа
if ( x + w > right ) { if ( x + w > right ) {
var foundCol = worksheet._findColUnderCursor(mmToPt(x + w), true); var scrollX = scrollOffset.getX();
var foundCol = worksheet._findColUnderCursor(mmToPt(x + w) + scrollX, true);
while ( foundCol == null ) { while ( foundCol == null ) {
worksheet.expandColsOnScroll(true); worksheet.expandColsOnScroll(true);
worksheet._trigger("reinitializeScrollX"); worksheet._trigger("reinitializeScrollX");
foundCol = worksheet._findColUnderCursor(mmToPt(x + w), true); foundCol = worksheet._findColUnderCursor(mmToPt(x + w) + scrollX, true);
} }
} }
// выход за границу снизу // выход за границу снизу
if ( y + h > bottom ) { if ( y + h > bottom ) {
var foundRow = worksheet._findRowUnderCursor(mmToPt(y + h), true); var scrollY = scrollOffset.getY();
var foundRow = worksheet._findRowUnderCursor(mmToPt(y + h) + scrollY, true);
while ( foundRow == null ) { while ( foundRow == null ) {
worksheet.expandRowsOnScroll(true); worksheet.expandRowsOnScroll(true);
worksheet._trigger("reinitializeScrollY"); worksheet._trigger("reinitializeScrollY");
foundRow = worksheet._findRowUnderCursor(mmToPt(y + h), true); foundRow = worksheet._findRowUnderCursor(mmToPt(y + h) + scrollY, true);
} }
} }
......
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