Commit c75893f8 authored by Oleg.Korshul's avatar Oleg.Korshul

comments position

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@59182 954022d7-b5bf-4e40-9824-e11837661b57
parent 041b8712
...@@ -1825,8 +1825,8 @@ function CDrawingDocument() ...@@ -1825,8 +1825,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 = (this.SlideCurrectRect.left + x * dKoef + _word_control.m_oMainContent.AbsolutePosition.L * g_dKoef_mm_to_pix) >> 0; var x_pix = (this.SlideCurrectRect.left + x * dKoef/* + _word_control.m_oMainContent.AbsolutePosition.L * g_dKoef_mm_to_pix*/) >> 0;
var y_pix = (this.SlideCurrectRect.top + y * dKoef + _word_control.m_oMainContent.AbsolutePosition.T * g_dKoef_mm_to_pix) >> 0; var y_pix = (this.SlideCurrectRect.top + y * dKoef/* + _word_control.m_oMainContent.AbsolutePosition.T * g_dKoef_mm_to_pix*/) >> 0;
x_pix += COMMENT_WIDTH; x_pix += COMMENT_WIDTH;
y_pix += ((COMMENT_HEIGHT / 3) >> 0); y_pix += ((COMMENT_HEIGHT / 3) >> 0);
......
...@@ -3492,10 +3492,12 @@ asc_docs_api.prototype.sync_AddComment = function(Id, CommentData) ...@@ -3492,10 +3492,12 @@ asc_docs_api.prototype.sync_AddComment = function(Id, CommentData)
asc_docs_api.prototype.sync_ShowComment = function(Id, X, Y) asc_docs_api.prototype.sync_ShowComment = function(Id, X, Y)
{ {
/*
if (this.WordControl.m_oMainContent) if (this.WordControl.m_oMainContent)
{ {
X -= ((this.WordControl.m_oMainContent.Bounds.L * g_dKoef_mm_to_pix) >> 0); X -= ((this.WordControl.m_oMainContent.Bounds.L * g_dKoef_mm_to_pix) >> 0);
} }
*/
// TODO: Переделать на нормальный массив // TODO: Переделать на нормальный массив
this.asc_fireCallback("asc_onShowComment", [ Id ], X, Y); this.asc_fireCallback("asc_onShowComment", [ Id ], 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