presentations mobile version

common/Scrolls/mobileTouchManagerBase.js

@@ -927,8 +927,8 @@
 
 	CMobileTouchManagerBase.prototype.ClearContextMenu = function()
 	{
-		this.ContextMenuLastMode 		= AscCommon.MobileTouchContextMenuType.None;
-		this.ContextMenuLastModeCounter = 0;
+		//this.ContextMenuLastMode 		= AscCommon.MobileTouchContextMenuType.None;
+		//this.ContextMenuLastModeCounter = 0;
 		this.Api.sendEvent("asc_onHidePopMenu");
 	};
 

slide/Drawing/HtmlPage.js

@@ -528,7 +528,7 @@ function CEditorPage(api)
 		// ----------
 
 		this.m_oMainView = CreateControlContainer("id_main_view");
-		this.m_oMainView.Bounds.SetParams(5, 7, ScrollWidthMm, 0, true, true, true, true, -1, -1);
+		this.m_oMainView.Bounds.SetParams(5, 7, this.m_oApi.isMobileVersion ? 0 : ScrollWidthMm, 0, true, true, true, true, -1, -1);
 		this.m_oMainView.Anchor = (g_anchor_left | g_anchor_right | g_anchor_top | g_anchor_bottom);
 		this.m_oMainContent.AddControl(this.m_oMainView);
 

slide/Drawing/mobileTouchManager.js

@@ -63,14 +63,15 @@
 	};
 	CMobileDelegateEditorPresentation.prototype.GetScrollerSize = function()
 	{
+		var _controlH = parseInt(this.HtmlPage.m_oMainView.HtmlElement.style.height);
 		return {
-			W : (this.DrawingDocument.SlideCurrectRect.right - this.DrawingDocument.SlideCurrectRect.left),
-			H : (this.DrawingDocument.SlideCurrectRect.bottom - this.DrawingDocument.SlideCurrectRect.top)
+			W : (this.HtmlPage.m_dDocumentWidth),
+			H : (this.HtmlPage.SlideScrollMAX - this.HtmlPage.SlideScrollMIN + _controlH)
 		};
 	};
 	CMobileDelegateEditorPresentation.prototype.GetObjectTrack = function(x, y, page)
 	{
-		return this.LogicDocument.Slides[this.LogicDocument.CurPage].graphicObjects.isPointInDrawingObjects(x, y, page);
+		return this.LogicDocument.Slides[this.LogicDocument.CurPage].graphicObjects.isPointInDrawingObjects3(x, y, page);
 	};
 	CMobileDelegateEditorPresentation.prototype.GetSelectionRectsBounds = function()
 	{
@@ -81,7 +82,7 @@
 		var bIsHorPresent = (this.HtmlPage.m_oScrollHorApi != null);
 		if (_scroll.directionLocked == "v")
 		{
-			this.HtmlPage.m_oScrollVerApi.scrollToY(-_scroll.y);
+			this.HtmlPage.m_oScrollVerApi.scrollToY(-_scroll.y + this.HtmlPage.SlideScrollMIN);
 		}
 		else if (_scroll.directionLocked == "h" && bIsHorPresent)
 		{
@@ -91,7 +92,7 @@
 		{
 			if (bIsHorPresent)
 				this.HtmlPage.m_oScrollHorApi.scrollToX(-_scroll.x);
-			this.HtmlPage.m_oScrollVerApi.scrollToY(-_scroll.y);
+			this.HtmlPage.m_oScrollVerApi.scrollToY(-_scroll.y + this.HtmlPage.SlideScrollMIN);
 		}
 	};
 	CMobileDelegateEditorPresentation.prototype.GetContextMenuType = function()

slide/api.js

@@ -1390,7 +1390,7 @@ background-repeat: no-repeat;\
                                     <canvas id=\"id_viewer_overlay\" class=\"block_elem\" style=\"-ms-touch-action: none;-webkit-user-select: none;z-index:2\"></canvas>\
                                     <canvas id=\"id_target_cursor\" class=\"block_elem\" width=\"1\" height=\"1\" style=\"-ms-touch-action: none;-webkit-user-select: none;width:2px;height:13px;display:none;z-index:4;\"></canvas>\
                                 </div>\
-							    <div id=\"id_panel_right\" class=\"block_elem\" style=\"margin-right:1px;background-color:#F1F1F1;\">\
+							    <div id=\"id_panel_right\" class=\"block_elem\" style=\"margin-right:1px;background-color:#F1F1F1;z-index:0;\">\
 							        <div id=\"id_buttonRulers\" class=\"block_elem buttonRuler\"></div>\
 								    <div id=\"id_vertical_scroll\" style=\"left:0;top:0;width:14px;overflow:hidden;position:absolute;\">\
 									    <div id=\"panel_right_scroll\" class=\"block_elem\" style=\"left:0;top:0;width:1px;height:6000px;\"></div>\