Commit acb37ec6 authored by SergeyLuzyanin's avatar SergeyLuzyanin

notes

parent 32e0d3d6
...@@ -4358,7 +4358,9 @@ CShape.prototype.draw = function (graphics, transform, transformText, pageIndex) ...@@ -4358,7 +4358,9 @@ CShape.prototype.draw = function (graphics, transform, transformText, pageIndex)
} }
} }
} }
if(!this.group)
var bNotes = !!(this.parent && this.parent.kind === AscFormat.TYPE_KIND.NOTES);
if(!this.group && !bNotes)
{ {
var oLock; var oLock;
if(this.parent instanceof ParaDrawing) if(this.parent instanceof ParaDrawing)
......
...@@ -211,6 +211,10 @@ CCollaborativeEditing.prototype.Send_Changes = function(IsUserSave, AdditionalIn ...@@ -211,6 +211,10 @@ CCollaborativeEditing.prototype.Send_Changes = function(IsUserSave, AdditionalIn
{ {
editor.WordControl.m_oDrawingDocument.OnEndRecalculate(); editor.WordControl.m_oDrawingDocument.OnEndRecalculate();
} }
var oSlide = editor.WordControl.m_oLogicDocument.Slides[editor.WordControl.m_oLogicDocument.CurPage];
if(oSlide && oSlide.notesShape){
editor.WordControl.m_oDrawingDocument.Notes_OnRecalculate(editor.WordControl.m_oLogicDocument.CurPage, oSlide.NotesWidth, oSlide.getNotesHeight());
}
editor.WordControl.m_oLogicDocument.Document_UpdateInterfaceState(); editor.WordControl.m_oLogicDocument.Document_UpdateInterfaceState();
editor.WordControl.m_oLogicDocument.Document_UpdateUndoRedoState(); editor.WordControl.m_oLogicDocument.Document_UpdateUndoRedoState();
......
...@@ -1144,7 +1144,8 @@ CPresentation.prototype = ...@@ -1144,7 +1144,8 @@ CPresentation.prototype =
for(key = 0; key < this.Slides.length; ++key) for(key = 0; key < this.Slides.length; ++key)
{ {
this.Slides[key].recalcText(); this.Slides[key].recalcText();
this.Slides[key].recalculate() this.Slides[key].recalculate();
this.Slides[key].recalculateNotesShape();
} }
} }
} }
...@@ -1191,6 +1192,7 @@ CPresentation.prototype = ...@@ -1191,6 +1192,7 @@ CPresentation.prototype =
{ {
this.DrawingDocument.OnRecalculatePage(i, this.Slides[i]); this.DrawingDocument.OnRecalculatePage(i, this.Slides[i]);
} }
this.DrawingDocument.Notes_OnRecalculate(this.CurPage, this.Slides[this.CurPage].NotesWidth, this.Slides[this.CurPage].getNotesHeight());
} }
else else
{ {
......
...@@ -1106,6 +1106,20 @@ Slide.prototype = ...@@ -1106,6 +1106,20 @@ Slide.prototype =
if(this.notesShape){ if(this.notesShape){
this.notesShape.draw(g); this.notesShape.draw(g);
var oLock = this.notesShape.Lock;
if(oLock && AscCommon.locktype_None != oLock.Get_Type())
{
var bCoMarksDraw = true;
if(typeof editor !== "undefined" && editor && AscFormat.isRealBool(editor.isCoMarksDraw)){
bCoMarksDraw = editor.isCoMarksDraw;
}
if(bCoMarksDraw){
g.transform3(this.notesShape.transformText);
var Width = this.notesShape.txBody.content.XLimit;
var Height = this.notesShape.txBody.content.Get_SummaryHeight();
g.DrawLockObjectRect(oLock.Get_Type(), 0, 0, Width, Height);
}
}
} }
}, },
......
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