From 00dfb687b2c1f68a3607f0217361de0a6bfd7680 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Sat, 13 Nov 2021 13:56:35 +0300 Subject: [PATCH] [DE] Bug 51187 --- .../main/app/controller/RightMenu.js | 2 ++ .../main/app/view/ImageSettingsAdvanced.js | 15 +++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/apps/documenteditor/main/app/controller/RightMenu.js b/apps/documenteditor/main/app/controller/RightMenu.js index d03610264..8143676de 100644 --- a/apps/documenteditor/main/app/controller/RightMenu.js +++ b/apps/documenteditor/main/app/controller/RightMenu.js @@ -205,6 +205,8 @@ define([ this._settings[settingsType].props = control_props; this._settings[settingsType].locked = control_lock; this._settings[settingsType].hidden = 0; + if (control_props.get_FormPr().get_Fixed()) + this._settings[Common.Utils.documentSettingsType.TextArt].hidden = 1; } } diff --git a/apps/documenteditor/main/app/view/ImageSettingsAdvanced.js b/apps/documenteditor/main/app/view/ImageSettingsAdvanced.js index 75278fe85..d5bd5ad40 100644 --- a/apps/documenteditor/main/app/view/ImageSettingsAdvanced.js +++ b/apps/documenteditor/main/app/view/ImageSettingsAdvanced.js @@ -1385,14 +1385,21 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat var shapeprops = props.get_ShapeProperties(); var chartprops = props.get_ChartProperties(); var pluginGuid = props.asc_getPluginGuid(); + var control_props = this.api && this.api.asc_IsContentControl() ? this.api.asc_GetContentControlProperties() : null, + fixed_size = false; + if (control_props) { + var spectype = control_props.get_SpecificType(); + fixed_size = (spectype==Asc.c_oAscContentControlSpecificType.CheckBox || spectype==Asc.c_oAscContentControlSpecificType.ComboBox || + spectype==Asc.c_oAscContentControlSpecificType.DropDownList || spectype==Asc.c_oAscContentControlSpecificType.None) && + control_props.get_FormPr() && control_props.get_FormPr().get_Fixed(); + } this.btnOriginalSize.setVisible(!(shapeprops || chartprops)); this.btnOriginalSize.setDisabled(props.get_ImageUrl()===null || props.get_ImageUrl()===undefined); - this.btnsCategory[5].setVisible(shapeprops!==null && !shapeprops.get_FromChart()); // Shapes - this.btnsCategory[6].setVisible(shapeprops!==null && !shapeprops.get_FromChart()); // Margins + this.btnsCategory[5].setVisible(shapeprops!==null && !shapeprops.get_FromChart() && !fixed_size); // Shapes + this.btnsCategory[6].setVisible(shapeprops!==null && !shapeprops.get_FromChart() && !fixed_size); // Margins + this.btnsCategory[7].setVisible(!fixed_size); // Alt this.btnsCategory[2].setVisible(!chartprops && (pluginGuid === null || pluginGuid === undefined)); // Rotation - - var control_props = this.api && this.api.asc_IsContentControl() ? this.api.asc_GetContentControlProperties() : null; this.btnsCategory[3].setDisabled(props.get_FromGroup() || !!control_props && (control_props.get_SpecificType()==Asc.c_oAscContentControlSpecificType.Picture)); // Wrapping if (shapeprops) {