From f3e7deb84697ea8be6bd5ee6efb6c5b352de92d7 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Mon, 26 Apr 2021 17:03:51 +0300 Subject: [PATCH] [DE] Enable arrange for grouped shapes --- apps/documenteditor/main/app/controller/PageLayout.js | 2 +- apps/documenteditor/main/app/view/DocumentHolder.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/documenteditor/main/app/controller/PageLayout.js b/apps/documenteditor/main/app/controller/PageLayout.js index c485d615a..0be70b040 100644 --- a/apps/documenteditor/main/app/controller/PageLayout.js +++ b/apps/documenteditor/main/app/controller/PageLayout.js @@ -147,7 +147,7 @@ define([ disable.align = islocked || wrapping == Asc.c_oAscWrapStyle2.Inline || content_locked; disable.group = islocked || wrapping == Asc.c_oAscWrapStyle2.Inline || content_locked; - disable.arrange = wrapping == Asc.c_oAscWrapStyle2.Inline || content_locked; + disable.arrange = (wrapping == Asc.c_oAscWrapStyle2.Inline) && !props.get_FromGroup() || content_locked; disable.wrapping = islocked || props.get_FromGroup() || (notflow && !me.api.CanChangeWrapPolygon()) || content_locked || (!!control_props && control_props.get_SpecificType()==Asc.c_oAscContentControlSpecificType.Picture); if ( !disable.group ) { diff --git a/apps/documenteditor/main/app/view/DocumentHolder.js b/apps/documenteditor/main/app/view/DocumentHolder.js index 71741b830..c036c4063 100644 --- a/apps/documenteditor/main/app/view/DocumentHolder.js +++ b/apps/documenteditor/main/app/view/DocumentHolder.js @@ -2640,7 +2640,7 @@ define([ menuImageAlign.menu.items[7].setDisabled(objcount==2 && (!alignto || alignto==3)); menuImageAlign.menu.items[8].setDisabled(objcount==2 && (!alignto || alignto==3)); } - menuImageArrange.setDisabled( wrapping == Asc.c_oAscWrapStyle2.Inline || content_locked); + menuImageArrange.setDisabled( (wrapping == Asc.c_oAscWrapStyle2.Inline) && !value.imgProps.value.get_FromGroup() || content_locked); if (me.api) { mnuUnGroup.setDisabled(islocked || !me.api.CanUnGroup());