Commit a3041045 authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

Поправил проблему при zoom с закрепленными областями

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57349 954022d7-b5bf-4e40-9824-e11837661b57
parent 2eaaea7c
...@@ -1566,6 +1566,12 @@ ...@@ -1566,6 +1566,12 @@
var arn = t.activeRange.clone(true); var arn = t.activeRange.clone(true);
var i; var i;
var cFrozen = 0, rFrozen = 0;
if (this.topLeftFrozenCell) {
cFrozen = this.topLeftFrozenCell.getCol0();
rFrozen = this.topLeftFrozenCell.getRow0();
}
do { do {
if (arn.r2 > vr.r2) { if (arn.r2 > vr.r2) {
i = arn.r2 - vr.r2; i = arn.r2 - vr.r2;
...@@ -1578,7 +1584,7 @@ ...@@ -1578,7 +1584,7 @@
vr.r1 += 1; vr.r1 += 1;
t._calcVisibleRows(); t._calcVisibleRows();
} }
if (arn.r1 < vr.r1) { if (arn.r1 < vr.r1 && arn.r1 >= rFrozen) {
i = arn.r1 - vr.r1; i = arn.r1 - vr.r1;
vr.r1 += i; vr.r1 += i;
vr.r2 += i; vr.r2 += i;
...@@ -1599,7 +1605,7 @@ ...@@ -1599,7 +1605,7 @@
vr.c1 += 1; vr.c1 += 1;
t._calcVisibleColumns(); t._calcVisibleColumns();
} }
if (arn.c1 < vr.c1) { if (arn.c1 < vr.c1 && arn.c1 >= cFrozen) {
i = arn.c1 - vr.c1; i = arn.c1 - vr.c1;
vr.c1 += i; vr.c1 += i;
vr.c2 += i; vr.c2 += i;
......
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