Commit 6997c5a0 authored by Oleg.Korshul's avatar Oleg.Korshul Committed by Alexander.Trofimov

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@51087 954022d7-b5bf-4e40-9824-e11837661b57
parent d1b7db35
...@@ -1783,8 +1783,8 @@ function CDrawingDocument() ...@@ -1783,8 +1783,8 @@ function CDrawingDocument()
var _word_control = this.m_oWordControl; var _word_control = this.m_oWordControl;
var dKoef = (this.m_oWordControl.m_nZoomValue * g_dKoef_mm_to_pix / 100); var dKoef = (this.m_oWordControl.m_nZoomValue * g_dKoef_mm_to_pix / 100);
var x_pix = parseInt(this.SlideCurrectRect.left + x * dKoef); var x_pix = (this.SlideCurrectRect.left + x * dKoef) >> 0;
var y_pix = parseInt(this.SlideCurrectRect.top + y * dKoef); var y_pix = (this.SlideCurrectRect.top + y * dKoef) >> 0;
return { X : x_pix, Y : y_pix, Error: false }; return { X : x_pix, Y : y_pix, Error: false };
} }
...@@ -2958,7 +2958,7 @@ function CDrawingDocument() ...@@ -2958,7 +2958,7 @@ function CDrawingDocument()
this.OnSelectEnd = function() this.OnSelectEnd = function()
{ {
}, }
this.GetCommentWidth = function(type) this.GetCommentWidth = function(type)
{ {
...@@ -2969,7 +2969,7 @@ function CDrawingDocument() ...@@ -2969,7 +2969,7 @@ function CDrawingDocument()
_index += 1; _index += 1;
return g_comment_image_offsets[_index][2] * g_dKoef_pix_to_mm * 100 / this.m_oWordControl.m_nZoomValue; return g_comment_image_offsets[_index][2] * g_dKoef_pix_to_mm * 100 / this.m_oWordControl.m_nZoomValue;
}, }
this.GetCommentHeight = function(type) this.GetCommentHeight = function(type)
{ {
...@@ -2981,6 +2981,28 @@ function CDrawingDocument() ...@@ -2981,6 +2981,28 @@ function CDrawingDocument()
return g_comment_image_offsets[_index][3] * g_dKoef_pix_to_mm * 100 / this.m_oWordControl.m_nZoomValue; return g_comment_image_offsets[_index][3] * g_dKoef_pix_to_mm * 100 / this.m_oWordControl.m_nZoomValue;
} }
this.DrawVerAnchor = function(xPos)
{
var _pos = this.ConvertCoordsToCursor(xPos, 0);
if (_pos.Error === false)
{
this.m_oWordControl.m_oOverlayApi.DashLineColor = "#D08A78";
this.m_oWordControl.m_oOverlayApi.VertLine(_pos.X, true);
this.m_oWordControl.m_oOverlayApi.DashLineColor = "#000000";
}
}
this.DrawHorAnchor = function(yPos)
{
var _pos = this.ConvertCoordsToCursor(0, yPos);
if (_pos.Error === false)
{
this.m_oWordControl.m_oOverlayApi.DashLineColor = "#D08A78";
this.m_oWordControl.m_oOverlayApi.HorLine(_pos.Y, true);
this.m_oWordControl.m_oOverlayApi.DashLineColor = "#000000";
}
}
} }
function CThPage() function CThPage()
......
...@@ -5176,7 +5176,7 @@ function CDrawingDocument() ...@@ -5176,7 +5176,7 @@ function CDrawingDocument()
{ {
if (this.m_oWordControl && this.m_oWordControl.MobileTouchManager) if (this.m_oWordControl && this.m_oWordControl.MobileTouchManager)
this.m_oWordControl.MobileTouchManager.CheckSelectEnd(false); this.m_oWordControl.MobileTouchManager.CheckSelectEnd(false);
}, }
// mouse events // mouse events
this.checkMouseDown_Drawing = function(pos) this.checkMouseDown_Drawing = function(pos)
...@@ -5271,7 +5271,7 @@ function CDrawingDocument() ...@@ -5271,7 +5271,7 @@ function CDrawingDocument()
} }
return false; return false;
}, }
this.checkMouseMove_Drawing = function(pos) this.checkMouseMove_Drawing = function(pos)
{ {
...@@ -5359,7 +5359,7 @@ function CDrawingDocument() ...@@ -5359,7 +5359,7 @@ function CDrawingDocument()
} }
return false; return false;
}, }
this.checkMouseUp_Drawing = function(pos) this.checkMouseUp_Drawing = function(pos)
{ {
...@@ -5401,7 +5401,7 @@ function CDrawingDocument() ...@@ -5401,7 +5401,7 @@ function CDrawingDocument()
} }
return false; return false;
}, }
this.checkCursorOnTrackRect = function(X, Y, eps, rect) this.checkCursorOnTrackRect = function(X, Y, eps, rect)
{ {
...@@ -5485,7 +5485,7 @@ function CDrawingDocument() ...@@ -5485,7 +5485,7 @@ function CDrawingDocument()
} }
return -1; return -1;
}, }
this.checkTrackRect = function(pos) this.checkTrackRect = function(pos)
{ {
...@@ -5612,6 +5612,28 @@ function CDrawingDocument() ...@@ -5612,6 +5612,28 @@ function CDrawingDocument()
} }
} }
} }
this.DrawVerAnchor = function(pageNum, xPos)
{
var _pos = this.ConvetToPageCoords(xPos, 0, pageNum);
if (_pos.Error === false)
{
this.m_oWordControl.m_oOverlayApi.DashLineColor = "#D08A78";
this.m_oWordControl.m_oOverlayApi.VertLine(_pos.X, true);
this.m_oWordControl.m_oOverlayApi.DashLineColor = "#000000";
}
}
this.DrawHorAnchor = function(pageNum, yPos)
{
var _pos = this.ConvetToPageCoords(0, yPos, pageNum);
if (_pos.Error === false)
{
this.m_oWordControl.m_oOverlayApi.DashLineColor = "#D08A78";
this.m_oWordControl.m_oOverlayApi.HorLine(_pos.Y, true);
this.m_oWordControl.m_oOverlayApi.DashLineColor = "#000000";
}
}
} }
function CStyleImage(_name, _ind, _type, _uiPriority) function CStyleImage(_name, _ind, _type, _uiPriority)
......
...@@ -33,6 +33,8 @@ function COverlay() ...@@ -33,6 +33,8 @@ function COverlay()
this.m_bIsAlwaysUpdateOverlay = false; this.m_bIsAlwaysUpdateOverlay = false;
this.m_oHtmlPage = null; this.m_oHtmlPage = null;
this.DashLineColor = "#000000";
} }
COverlay.prototype = COverlay.prototype =
...@@ -101,7 +103,7 @@ COverlay.prototype = ...@@ -101,7 +103,7 @@ COverlay.prototype =
var x = ((position + 0.5) >> 0) + 0.5; var x = ((position + 0.5) >> 0) + 0.5;
var y = 0; var y = 0;
this.m_oContext.strokeStyle = "#000000"; this.m_oContext.strokeStyle = this.DashLineColor;
this.m_oContext.beginPath(); this.m_oContext.beginPath();
while (y < this.max_y) while (y < this.max_y)
...@@ -167,7 +169,7 @@ COverlay.prototype = ...@@ -167,7 +169,7 @@ COverlay.prototype =
var y = ((position + 0.5) >> 0) + 0.5; var y = ((position + 0.5) >> 0) + 0.5;
var x = 0; var x = 0;
this.m_oContext.strokeStyle = "#000000"; this.m_oContext.strokeStyle = this.DashLineColor;
this.m_oContext.beginPath(); this.m_oContext.beginPath();
while (x < this.max_x) while (x < this.max_x)
......
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