Commit 6cf67938 authored by Sergey Luzyanin's avatar Sergey Luzyanin

fix Bug 28081 - Фокус остается на панели эскизов после добавления изображения

parent bb64b214
...@@ -1300,6 +1300,7 @@ CPresentation.prototype = ...@@ -1300,6 +1300,7 @@ CPresentation.prototype =
{ {
if(this.Slides[this.CurPage]) if(this.Slides[this.CurPage])
{ {
editor.WordControl.Thumbnails.SetFocusElement(FOCUS_OBJECT_MAIN);
History.Create_NewPoint(AscDFH.historydescription_Presentation_AddFlowImage); History.Create_NewPoint(AscDFH.historydescription_Presentation_AddFlowImage);
var Image = this.Slides[this.CurPage].graphicObjects.createImage(Img, (this.Slides[this.CurPage].Width - W)/2, (this.Slides[this.CurPage].Height - H)/2, W, H); var Image = this.Slides[this.CurPage].graphicObjects.createImage(Img, (this.Slides[this.CurPage].Width - W)/2, (this.Slides[this.CurPage].Height - H)/2, W, H);
Image.setParent(this.Slides[this.CurPage]); Image.setParent(this.Slides[this.CurPage]);
...@@ -1316,6 +1317,7 @@ CPresentation.prototype = ...@@ -1316,6 +1317,7 @@ CPresentation.prototype =
var _this = this; var _this = this;
_this.Slides[_this.CurPage] && _this.Slides[_this.CurPage].graphicObjects.checkSelectedObjectsAndCallback(function() _this.Slides[_this.CurPage] && _this.Slides[_this.CurPage].graphicObjects.checkSelectedObjectsAndCallback(function()
{ {
editor.WordControl.Thumbnails.SetFocusElement(FOCUS_OBJECT_MAIN);
var Image = _this.Slides[_this.CurPage].graphicObjects.getChartSpace2(binary, null); var Image = _this.Slides[_this.CurPage].graphicObjects.getChartSpace2(binary, null);
Image.setParent(_this.Slides[_this.CurPage]); Image.setParent(_this.Slides[_this.CurPage]);
Image.addToDrawingObjects(); Image.addToDrawingObjects();
...@@ -1375,6 +1377,7 @@ CPresentation.prototype = ...@@ -1375,6 +1377,7 @@ CPresentation.prototype =
var graphic_frame = this.Create_TableGraphicFrame(Cols, Rows, this.Slides[this.CurPage], this.DefaultTableStyleId); var graphic_frame = this.Create_TableGraphicFrame(Cols, Rows, this.Slides[this.CurPage], this.DefaultTableStyleId);
if(this.Document_Is_SelectionLocked(AscCommon.changestype_AddShape, graphic_frame) === false) if(this.Document_Is_SelectionLocked(AscCommon.changestype_AddShape, graphic_frame) === false)
{ {
editor.WordControl.Thumbnails.SetFocusElement(FOCUS_OBJECT_MAIN);
//this.Slides[this.CurPage].graphicObjects.resetSelection(); //this.Slides[this.CurPage].graphicObjects.resetSelection();
//this.Slides[this.CurPage].graphicObjects.selectObject(graphic_frame, 0); //this.Slides[this.CurPage].graphicObjects.selectObject(graphic_frame, 0);
this.Check_GraphicFrameRowHeight(graphic_frame); this.Check_GraphicFrameRowHeight(graphic_frame);
......
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