From cd40f2b4cdd40e758655eda551c37877a7a7c5ea Mon Sep 17 00:00:00 2001 From: maxkadushkin Date: Fri, 20 Feb 2026 17:37:37 +0300 Subject: [PATCH] [forms] change controls for Stretch menu --- apps/documenteditor/main/app/view/DocumentHolderExt.js | 9 +++++---- apps/documenteditor/main/locale/en.json | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/apps/documenteditor/main/app/view/DocumentHolderExt.js b/apps/documenteditor/main/app/view/DocumentHolderExt.js index 50f9c9efbc..659e97dc92 100644 --- a/apps/documenteditor/main/app/view/DocumentHolderExt.js +++ b/apps/documenteditor/main/app/view/DocumentHolderExt.js @@ -862,13 +862,13 @@ define([], function () { }); me.menuImgStretchContentControl = new Common.UI.MenuItem({ - // iconCls: 'menu__icon', + iconCls: 'menu__icon btn-resize-to-cell', caption: me.textStretchControl, value: 'stretch' }); me.menuTableStretchContentControl = new Common.UI.MenuItem({ - // iconCls: 'menu__icon', + iconCls: 'menu__icon btn-resize-to-cell', caption: me.textStretchControl, value: 'stretch' }); @@ -954,7 +954,7 @@ define([], function () { content_locked = lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.ContentLocked, is_form = control_props && control_props.get_FormPr(); - me.menuImgStretchContentControl.setVisible(in_control); + me.menuImgStretchContentControl.setVisible(is_form); me.menuImgRemoveControl.setVisible(in_control); me.menuImgControlSettings.setVisible(in_control && me.mode.canEditContentControl && !is_form); menuImgControlSeparator.setVisible(in_control); @@ -1814,12 +1814,12 @@ define([], function () { !value.paraProps.value.can_DeleteInlineContentControl() || !value.paraProps.value.can_EditInlineContentControl()) : false; var in_toc = me.api.asc_GetTableOfContentsPr(true), in_control = !in_toc && me.api.asc_IsContentControl(); - me.menuTableStretchContentControl.setVisible(in_control); if (in_control) { var control_props = me.api.asc_GetContentControlProperties(), lock_type = (control_props) ? control_props.get_Lock() : Asc.c_oAscSdtLockType.Unlocked, is_form = control_props && control_props.get_FormPr(); me.menuTableRemoveForm.setVisible(is_form); + me.menuTableStretchContentControl.setVisible(is_form); menuTableControl.setVisible(!is_form); if (is_form) { me.menuTableRemoveForm.setDisabled(lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.SdtLocked); @@ -1834,6 +1834,7 @@ define([], function () { } else { menuTableControl.setVisible(in_control); me.menuTableRemoveForm.setVisible(in_control); + me.menuTableStretchContentControl.setVisible(false); } me.menuTableTOC.setVisible(in_toc); diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json index f07a7fc83a..94006aaaf5 100644 --- a/apps/documenteditor/main/locale/en.json +++ b/apps/documenteditor/main/locale/en.json @@ -2469,7 +2469,7 @@ "DE.Views.DocumentHolder.textRemField": "Remove text field", "DE.Views.DocumentHolder.textRemove": "Remove", "DE.Views.DocumentHolder.textRemoveControl": "Remove content control", - "DE.Views.DocumentHolder.textStretchControl": "Stretch content control", + "DE.Views.DocumentHolder.textStretchControl": "Resize to cell", "DE.Views.DocumentHolder.textRemPicture": "Remove image", "DE.Views.DocumentHolder.textRemRadioBox": "Remove Radio button", "DE.Views.DocumentHolder.textReplace": "Replace image",