Commit d645e5dd authored by Oleg Korshul's avatar Oleg Korshul

rulers bug (presentations)

parent c58732c6
...@@ -3551,6 +3551,11 @@ function CEditorPage(api) ...@@ -3551,6 +3551,11 @@ function CEditorPage(api)
return str; return str;
//console.log(str); //console.log(str);
}; };
this.GetMainContentBounds = function()
{
return this.m_oMainParent.AbsolutePosition;
};
} }
//------------------------------------------------------------export---------------------------------------------------- //------------------------------------------------------------export----------------------------------------------------
......
...@@ -3854,6 +3854,11 @@ function CEditorPage(api) ...@@ -3854,6 +3854,11 @@ function CEditorPage(api)
var dKoef = g_dKoef_mm_to_pix * this.m_nZoomValue / 100; var dKoef = g_dKoef_mm_to_pix * this.m_nZoomValue / 100;
return 5 + dKoef * x; return 5 + dKoef * x;
}; };
this.GetMainContentBounds = function()
{
return this.m_oMainContent.AbsolutePosition;
};
} }
var _message_update = "zero_delay_update"; var _message_update = "zero_delay_update";
......
...@@ -1096,7 +1096,7 @@ function CHorRuler() ...@@ -1096,7 +1096,7 @@ function CHorRuler()
var hor_ruler = word_control.m_oTopRuler_horRuler; var hor_ruler = word_control.m_oTopRuler_horRuler;
var dKoefPxToMM = 100 * g_dKoef_pix_to_mm / word_control.m_nZoomValue; var dKoefPxToMM = 100 * g_dKoef_pix_to_mm / word_control.m_nZoomValue;
var _x = global_mouseEvent.X - 5 * g_dKoef_mm_to_pix - left - word_control.X - word_control.m_oMainContent.AbsolutePosition.L * g_dKoef_mm_to_pix; var _x = global_mouseEvent.X - 5 * g_dKoef_mm_to_pix - left - word_control.X - word_control.GetMainContentBounds().L * g_dKoef_mm_to_pix;
_x *= dKoefPxToMM; _x *= dKoefPxToMM;
var _y = (global_mouseEvent.Y - word_control.Y) * g_dKoef_pix_to_mm; var _y = (global_mouseEvent.Y - word_control.Y) * g_dKoef_pix_to_mm;
...@@ -1821,7 +1821,7 @@ function CHorRuler() ...@@ -1821,7 +1821,7 @@ function CHorRuler()
var dKoefPxToMM = 100 * g_dKoef_pix_to_mm / word_control.m_nZoomValue; var dKoefPxToMM = 100 * g_dKoef_pix_to_mm / word_control.m_nZoomValue;
var dKoef_mm_to_pix = g_dKoef_mm_to_pix * this.m_dZoom; var dKoef_mm_to_pix = g_dKoef_mm_to_pix * this.m_dZoom;
var _x = global_mouseEvent.X - 5 * g_dKoef_mm_to_pix - left - word_control.X - word_control.m_oMainContent.AbsolutePosition.L * g_dKoef_mm_to_pix; var _x = global_mouseEvent.X - 5 * g_dKoef_mm_to_pix - left - word_control.X - word_control.GetMainContentBounds().L * g_dKoef_mm_to_pix;
_x *= dKoefPxToMM; _x *= dKoefPxToMM;
var _y = (global_mouseEvent.Y - word_control.Y) * g_dKoef_pix_to_mm; var _y = (global_mouseEvent.Y - word_control.Y) * g_dKoef_pix_to_mm;
...@@ -3478,7 +3478,7 @@ function CVerRuler() ...@@ -3478,7 +3478,7 @@ function CVerRuler()
var _y = global_mouseEvent.Y - 7 * g_dKoef_mm_to_pix - top - word_control.Y; var _y = global_mouseEvent.Y - 7 * g_dKoef_mm_to_pix - top - word_control.Y;
_y *= dKoefPxToMM; _y *= dKoefPxToMM;
var _x = (global_mouseEvent.X - word_control.X) * g_dKoef_pix_to_mm - word_control.m_oMainContent.AbsolutePosition.L; var _x = (global_mouseEvent.X - word_control.X) * g_dKoef_pix_to_mm - word_control.GetMainContentBounds().L;
this.DragType = this.CheckMouseType(_x, _y); this.DragType = this.CheckMouseType(_x, _y);
......
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