pengjunjie/sdkjs
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/sdkjs.git synced 2026-04-07 14:09:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Inline tracker (developing...)

Browse Source
This commit is contained in:
Oleg Korshul
2019-02-05 14:17:18 +03:00
parent c0b312af9e
commit cb05e2d239
2 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
slide/Drawing/DrawingDocument.js
View File

@ -3427,7 +3427,7 @@ function CDrawingDocument()
if (this.InlineTextTrackEnabled)
{
this.InlineTextTrack = oWordControl.m_oLogicDocument.Get_NearestPos(pos.Page, pos.X, pos.Y);
this.InlineTextTrack = oWordControl.m_oLogicDocument.Get_NearestPos(pos.Page, pos.X, pos.Y, pos.isNotes);
this.InlineTextTrackPage = pos.Page;
oWordControl.ShowOverlay();
@ -3445,7 +3445,7 @@ function CDrawingDocument()
if (this.InlineTextTrackEnabled)
{
this.InlineTextTrack = oWordControl.m_oLogicDocument.Get_NearestPos(pos.Page, pos.X, pos.Y);
this.InlineTextTrack = oWordControl.m_oLogicDocument.Get_NearestPos(pos.Page, pos.X, pos.Y, pos.isNotes);
this.InlineTextTrackPage = pos.Page;
this.EndTrackText();
@ -6024,6 +6024,14 @@ function CNotesDrawer(page)
_x *= g_dKoef_pix_to_mm;
_y *= g_dKoef_pix_to_mm;
var pos = { Page : oThis.HtmlPage.m_oDrawingDocument.SlideCurrent, X : _x, Y : _y, isNotes : true };
var ret = oThis.HtmlPage.m_oDrawingDocument.checkMouseDown_Drawing(pos);
if (ret === true)
{
AscCommon.stopEvent(e);
return;
}
oThis.HtmlPage.StartUpdateOverlay();
oThis.HtmlPage.m_oLogicDocument.Notes_OnMouseDown(global_mouseEvent, _x, _y);
oThis.HtmlPage.EndUpdateOverlay();
@ -6047,6 +6055,12 @@ function CNotesDrawer(page)
oThis.HtmlPage.StartUpdateOverlay();
if ((-1 != oThis.m_oTimerScrollSelect) || (is_overlay_attack === true))
oThis.HtmlPage.OnUpdateOverlay();
var pos = { Page : oThis.HtmlPage.m_oDrawingDocument.SlideCurrent, X : _x, Y : _y, isNotes : true };
var is_drawing = oThis.HtmlPage.m_oDrawingDocument.checkMouseMove_Drawing(pos);
if (is_drawing === true)
return;
oThis.HtmlPage.m_oLogicDocument.Notes_OnMouseMove(global_mouseEvent, _x, _y);
oThis.HtmlPage.EndUpdateOverlay();
};
@ -6072,6 +6086,12 @@ function CNotesDrawer(page)
_y *= g_dKoef_pix_to_mm;
oThis.HtmlPage.StartUpdateOverlay();
var pos = { Page : oThis.HtmlPage.m_oDrawingDocument.SlideCurrent, X : _x, Y : _y, isNotes : true };
var is_drawing = oThis.HtmlPage.m_oDrawingDocument.checkMouseUp_Drawing(pos);
if (is_drawing === true)
return;
oThis.HtmlPage.m_oLogicDocument.Notes_OnMouseUp(global_mouseEvent, _x, _y);
oThis.HtmlPage.EndUpdateOverlay();

3
slide/Drawing/HtmlPage.js
View File

@ -2241,11 +2241,12 @@ function CEditorPage(api)
if (oWordControl.m_oDrawingDocument.m_sLockedCursorType != "")
oWordControl.m_oDrawingDocument.SetCursorType("default");
oWordControl.StartUpdateOverlay();
var is_drawing = oWordControl.m_oDrawingDocument.checkMouseMove_Drawing(pos);
if (is_drawing === true)
return;
oWordControl.StartUpdateOverlay();
oWordControl.m_oLogicDocument.OnMouseMove(global_mouseEvent, pos.X, pos.Y, pos.Page);
oWordControl.EndUpdateOverlay();
};