[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - svx/source svx/uiconfig

[Pranam Lashkari (via logerrit)]

 svx/source/sidebar/possize/PosSizePropertyPanel.cxx |    6 ++++
 svx/source/sidebar/possize/PosSizePropertyPanel.hxx |    3 ++
 svx/uiconfig/ui/sidebarpossize.ui                   |   25 ++++++++++++++++++--
 3 files changed, 32 insertions(+), 2 deletions(-)

New commits:
commit ee0b6f291ef605f44d466bd8b0ccec52d5c9c725
Author:     Pranam Lashkari <lpranam at collabora.com>
AuthorDate: Sat Mar 28 06:02:05 2020 +0530
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Mon Mar 30 18:14:13 2020 +0200

    use "To Background" and "To Foreground" only in writer sidebar
    
    Change-Id: Ib7ccac192721b663c9655417fc3d639766d0424d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91267
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index 5af69633c30b..1b018d06df9f 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -101,6 +101,7 @@ PosSizePropertyPanel::PosSizePropertyPanel(
     get( mpFtFlip,    "fliplabel" );
     get( mpFlipTbx,   "selectrotationtype" );
     get( mpBtnEditChart,   "btnEditChart" );
+    get( mArrang,     "shaperespectedtotext");
     Initialize();
 
     mpBindings->Update( SID_ATTR_METRIC );
@@ -268,12 +269,14 @@ void PosSizePropertyPanel::HandleContextChange(
     bool bShowAngle = false;
     bool bShowFlip = false;
     bool bShowEditChart = false;
+    bool bShowArrangeShape = false;
 
     switch (maContext.GetCombinedContext_DI())
     {
         case CombinedEnumContext(Application::WriterVariants, Context::Draw):
             bShowAngle = true;
             bShowFlip = true;
+            bShowArrangeShape = true;
             break;
 
         case CombinedEnumContext(Application::WriterVariants, Context::Graphic):
@@ -333,6 +336,9 @@ void PosSizePropertyPanel::HandleContextChange(
     // Edit Chart
     mpBtnEditChart->Show(bShowEditChart);
 
+    // Arrange with respect to text
+    mArrang->Show(bShowArrangeShape);
+
     if (mxSidebar.is())
         mxSidebar->requestLayout();
 }
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
index 8947f0f14a0f..a9ba3f3c8ba6 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
@@ -112,6 +112,9 @@ private:
     //edit charts button for online's mobile view
     VclPtr<PushButton>       mpBtnEditChart;
 
+    // Arrange with respect to text
+    VclPtr<ToolBox>          mArrang;
+
     // Internal variables
     basegfx::B2DRange                       maRect;
     basegfx::B2DRange                       maWorkArea;
diff --git a/svx/uiconfig/ui/sidebarpossize.ui b/svx/uiconfig/ui/sidebarpossize.ui
index 727c90c62580..5a5fc9a00a6c 100644
--- a/svx/uiconfig/ui/sidebarpossize.ui
+++ b/svx/uiconfig/ui/sidebarpossize.ui
@@ -419,6 +419,27 @@
                         <property name="homogeneous">True</property>
                       </packing>
                     </child>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">False</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="sfxlo-SidebarToolBox" id="shaperespectedtotext">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="has_tooltip">True</property>
+                    <property name="tooltip_text" translatable="yes" context="sidebarpossize|arrangetoolbar">Arrange</property>
+                    <property name="halign">end</property>
+                    <property name="show_arrow">False</property>
+                    <child>
+                      <object class="GtkSeparatorToolItem">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                      </object>
+                    </child>
                     <child>
                       <object class="GtkToolButton" id="tobackground">
                         <property name="visible">True</property>
@@ -446,8 +467,8 @@
                   </object>
                   <packing>
                     <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
+                    <property name="fill">False</property>
+                    <property name="position">2</property>
                   </packing>
                 </child>
               </object>