Commit 3685f419 authored by Oleg Korshul's avatar Oleg Korshul

fix Bug 33916

parent beb1dba0
...@@ -612,6 +612,8 @@ ...@@ -612,6 +612,8 @@
this.eventsElement = _config.eventsElement; this.eventsElement = _config.eventsElement;
this.pointerTouchesCoords = {}; this.pointerTouchesCoords = {};
this.IsZoomCheckFit = false;
} }
CMobileTouchManagerBase.prototype.initEvents = function(_id) CMobileTouchManagerBase.prototype.initEvents = function(_id)
...@@ -1047,6 +1049,23 @@ ...@@ -1047,6 +1049,23 @@
} }
}; };
CMobileTouchManagerBase.prototype.BeginZoomCheck = function()
{
var _zoomCurrent = this.delegate.GetZoom();
var _zoomFit = this.delegate.GetZoomFit();
this.IsZoomCheckFit = (_zoomCurrent == _zoomFit) ? true : false;
};
CMobileTouchManagerBase.prototype.EndZoomCheck = function()
{
var _zoomCurrent = this.delegate.GetZoom();
var _zoomFit = this.delegate.GetZoomFit();
if (this.IsZoomCheckFit || _zoomCurrent < _zoomFit)
this.delegate.SetZoom(this.delegate.GetZoomFit());
this.IsZoomCheckFit = false;
};
// изменился размер документа/экрана => нужно перескитать вспомогательный элемент для скролла // изменился размер документа/экрана => нужно перескитать вспомогательный элемент для скролла
CMobileTouchManagerBase.prototype.Resize = function() CMobileTouchManagerBase.prototype.Resize = function()
{ {
......
...@@ -4949,7 +4949,13 @@ background-repeat: no-repeat;\ ...@@ -4949,7 +4949,13 @@ background-repeat: no-repeat;\
asc_docs_api.prototype.changeSlideSize = function(width, height) asc_docs_api.prototype.changeSlideSize = function(width, height)
{ {
if (this.isMobileVersion && this.WordControl.MobileTouchManager)
this.WordControl.MobileTouchManager.BeginZoomCheck();
this.WordControl.m_oLogicDocument.changeSlideSize(width, height); this.WordControl.m_oLogicDocument.changeSlideSize(width, height);
if (this.isMobileVersion && this.WordControl.MobileTouchManager)
this.WordControl.MobileTouchManager.EndZoomCheck();
}; };
asc_docs_api.prototype.AddSlide = function(layoutIndex) asc_docs_api.prototype.AddSlide = function(layoutIndex)
......
...@@ -3410,12 +3410,18 @@ background-repeat: no-repeat;\ ...@@ -3410,12 +3410,18 @@ background-repeat: no-repeat;\
{ {
if (false === this.WordControl.m_oLogicDocument.Document_Is_SelectionLocked(AscCommon.changestype_Document_SectPr)) if (false === this.WordControl.m_oLogicDocument.Document_Is_SelectionLocked(AscCommon.changestype_Document_SectPr))
{ {
if (this.isMobileVersion && this.WordControl.MobileTouchManager)
this.WordControl.MobileTouchManager.BeginZoomCheck();
this.WordControl.m_oDrawingDocument.m_bIsUpdateDocSize = true; this.WordControl.m_oDrawingDocument.m_bIsUpdateDocSize = true;
this.WordControl.m_oLogicDocument.Create_NewHistoryPoint(AscDFH.historydescription_Document_SetPageSize); this.WordControl.m_oLogicDocument.Create_NewHistoryPoint(AscDFH.historydescription_Document_SetPageSize);
if (this.DocumentOrientation) if (this.DocumentOrientation)
this.WordControl.m_oLogicDocument.Set_DocumentPageSize(width, height); this.WordControl.m_oLogicDocument.Set_DocumentPageSize(width, height);
else else
this.WordControl.m_oLogicDocument.Set_DocumentPageSize(height, width); this.WordControl.m_oLogicDocument.Set_DocumentPageSize(height, width);
if (this.isMobileVersion && this.WordControl.MobileTouchManager)
this.WordControl.MobileTouchManager.EndZoomCheck();
} }
}; };
......
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