Commit eb997125 authored by GoshaZotov's avatar GoshaZotov

change function getSpecialPasteCoords

return cellCoord as array
parent bd84ac28
...@@ -10037,20 +10037,42 @@ ...@@ -10037,20 +10037,42 @@
//TODO пересмотреть когда иконка вылезает за пределы области видимости //TODO пересмотреть когда иконка вылезает за пределы области видимости
var cellCoord = this.getCellCoord(range.c2, range.r2); var cellCoord = this.getCellCoord(range.c2, range.r2);
if(!isVisible || window['AscCommon'].g_clipboardBase.specialPasteButtonProps.shapeId) if(window['AscCommon'].g_clipboardBase.specialPasteButtonProps.shapeId)
{ {
disableCoords(); disableCoords();
cellCoord = [cellCoord];
} }
else else
{ {
var visibleCellCoord = this.getCellCoord(this.visibleRange.c2, this.visibleRange.r2); if (!isVisible)
var offset = 3;
var widthIcon = 30 + offset;
var heightIcon = 22 + offset;
if(cellCoord._x + widthIcon > visibleCellCoord._x || cellCoord._y + heightIcon > visibleCellCoord._y)
{ {
disableCoords(); var visibleRange = this.getVisibleRange();
var intersectionVisibleRange = visibleRange.intersection(range);
if(intersectionVisibleRange)
{
cellCoord = [];
cellCoord[0] = this.getCellCoord(intersectionVisibleRange.c2, intersectionVisibleRange.r2);
cellCoord[1] = this.getCellCoord(range.c1, range.r1);
}
else
{
disableCoords();
cellCoord = [cellCoord];
}
}
else
{
var visibleCellCoord = this.getCellCoord(this.visibleRange.c2, this.visibleRange.r2);
var offset = 3;
var widthIcon = 30 + offset;
var heightIcon = 22 + offset;
if(cellCoord._x + widthIcon > visibleCellCoord._x || cellCoord._y + heightIcon > visibleCellCoord._y)
{
disableCoords();
}
cellCoord = [cellCoord];
} }
} }
......
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