Commit 18a3ddc3 authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

ClearFontsRasterCache надо делать только при zoom-е (ранее делалось на любой resize).

Тормоза при появлении правых панелей в IE.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@55933 954022d7-b5bf-4e40-9824-e11837661b57
parent 4fa4893a
...@@ -3154,10 +3154,6 @@ function DrawingObjects() { ...@@ -3154,10 +3154,6 @@ function DrawingObjects() {
_this.resizeCanvas = function() { _this.resizeCanvas = function() {
_this.drawingArea.init(); _this.drawingArea.init();
for (var i = 0; i < drawingCtx.fmgrGraphics.length; i++) {
drawingCtx.fmgrGraphics[i].ClearRasterMemory();
}
shapeCtx.init( drawingCtx.ctx, drawingCtx.getWidth(0), drawingCtx.getHeight(0), drawingCtx.getWidth(3), drawingCtx.getHeight(3) ); shapeCtx.init( drawingCtx.ctx, drawingCtx.getWidth(0), drawingCtx.getHeight(0), drawingCtx.getWidth(3), drawingCtx.getHeight(3) );
shapeCtx.CalculateFullTransform(); shapeCtx.CalculateFullTransform();
......
...@@ -1337,10 +1337,14 @@ ...@@ -1337,10 +1337,14 @@
this.buffers.mainGraphic.changeZoom(factor); this.buffers.mainGraphic.changeZoom(factor);
this.buffers.overlayGraphic.changeZoom(factor); this.buffers.overlayGraphic.changeZoom(factor);
this.drawingCtxCharts.changeZoom(factor); this.drawingCtxCharts.changeZoom(factor);
// Нужно сбросить кэш букв
var i, length;
for (i = 0, length = this.fmgrGraphics.length; i < length; ++i)
this.fmgrGraphics[i].ClearFontsRasterCache();
var item; var item;
var activeIndex = this.model.getActive(); var activeIndex = this.model.getActive();
for(var i in this.wsViews) if (this.wsViews.hasOwnProperty(i)) { for(i in this.wsViews) if (this.wsViews.hasOwnProperty(i)) {
item = this.wsViews[i]; item = this.wsViews[i];
// Меняем zoom (для не активных сменим как только сделаем его активным) // Меняем zoom (для не активных сменим как только сделаем его активным)
item.changeZoom(/*isDraw*/i == activeIndex); item.changeZoom(/*isDraw*/i == activeIndex);
...@@ -1906,12 +1910,9 @@ ...@@ -1906,12 +1910,9 @@
}; };
WorkbookView.prototype._setHintsProps = function (bIsHinting, bIsSubpixHinting) { WorkbookView.prototype._setHintsProps = function (bIsHinting, bIsSubpixHinting) {
var index, manager, hintProps; var manager, hintProps;
for (index in this.fmgrGraphics) { for (var i = 0, length = this.fmgrGraphics.length; i < length; ++i) {
if (!this.fmgrGraphics.hasOwnProperty(index)) manager = this.fmgrGraphics[i];
continue;
manager = this.fmgrGraphics[index];
hintProps = manager.m_oLibrary.tt_hint_props; hintProps = manager.m_oLibrary.tt_hint_props;
if (!hintProps) if (!hintProps)
continue; continue;
......
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