Commit 76b94311 authored by Igor.Zotov's avatar Igor.Zotov Committed by Alexander.Trofimov
parent 551b70a9
...@@ -1102,7 +1102,7 @@ var gUndoInsDelCellsFlag = true; ...@@ -1102,7 +1102,7 @@ var gUndoInsDelCellsFlag = true;
//проверяем, затрагивают ли данные кнопки визуальную область //проверяем, затрагивают ли данные кнопки визуальную область
if (buttons) { if (buttons) {
for (var i = 0; i < buttons.length; i++) { for (var i = 0; i < buttons.length; i++) {
if (!this._isNeedDrawButton(buttons[i], updatedRange)) if (!this._isNeedDrawButton(buttons[i]))
continue; continue;
var range = ws.model.getCell(new CellAddress(buttons[i].id)).getCells(); var range = ws.model.getCell(new CellAddress(buttons[i].id)).getCells();
...@@ -6726,7 +6726,8 @@ var gUndoInsDelCellsFlag = true; ...@@ -6726,7 +6726,8 @@ var gUndoInsDelCellsFlag = true;
return true; return true;
}, },
_isNeedDrawButton: function(button, visibleRange) { _isNeedDrawButton: function(button) {
var visibleRange = this.worksheet.visibleRange;
var buttonRange = this._idToRange(button.id); var buttonRange = this._idToRange(button.id);
return (buttonRange.r1 >= visibleRange.r1 && buttonRange.r1 <= visibleRange.r2 && buttonRange.c1 >= visibleRange.c1 && buttonRange.c1 <= visibleRange.c2) return (buttonRange.r1 >= visibleRange.r1 && buttonRange.r1 <= visibleRange.r2 && buttonRange.c1 >= visibleRange.c1 && buttonRange.c1 <= visibleRange.c2)
}, },
......
...@@ -5774,7 +5774,7 @@ ...@@ -5774,7 +5774,7 @@
var xWithOffset = x + offsetX; var xWithOffset = x + offsetX;
var yWithOffset = y + offsetY; var yWithOffset = y + offsetY;
var autoFilterInfo = this.autoFilters.checkCursor(xWithOffset, yWithOffset); var autoFilterInfo = this.autoFilters.checkCursor(x, y);
if (autoFilterInfo) if (autoFilterInfo)
return {cursor: kCurAutoFilter, target: c_oTargetType.FilterObject, col: -1, row: -1, idFilter: autoFilterInfo.id}; return {cursor: kCurAutoFilter, target: c_oTargetType.FilterObject, col: -1, row: -1, idFilter: autoFilterInfo.id};
......
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