[Libreoffice-commits] core.git: include/sfx2 sfx2/source sfx2/uiconfig

[Caolán McNamara (via logerrit)]

 include/sfx2/sidebar/Deck.hxx  |    2 +-
 include/sfx2/sidebar/Panel.hxx |    6 +++---
 sfx2/source/sidebar/Deck.cxx   |    2 +-
 sfx2/source/sidebar/Panel.cxx  |    6 +++---
 sfx2/uiconfig/ui/panel.ui      |   14 ++++++++------
 5 files changed, 16 insertions(+), 14 deletions(-)

New commits:
commit 93bda63aaadedda64dfb8f4a6f9d7f3a08d49aab
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Jul 6 12:34:45 2021 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue Jul 6 16:46:54 2021 +0200

    use box instead of grid
    
    Change-Id: I394779489c256d666e14c7c5bfe55e8ebd94e32d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118481
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/include/sfx2/sidebar/Deck.hxx b/include/sfx2/sidebar/Deck.hxx
index a3d3a63aff01..1c6d2faae379 100644
--- a/include/sfx2/sidebar/Deck.hxx
+++ b/include/sfx2/sidebar/Deck.hxx
@@ -80,7 +80,7 @@ private:
     VclPtr<SidebarDockingWindow> mxParentWindow;
     std::unique_ptr<DeckTitleBar> mxTitleBar;
     std::unique_ptr<weld::ScrolledWindow> mxVerticalScrollBar;
-    std::unique_ptr<weld::Container> mxContents;
+    std::unique_ptr<weld::Box> mxContents;
 };
 
 } // end of namespace sfx2::sidebar
diff --git a/include/sfx2/sidebar/Panel.hxx b/include/sfx2/sidebar/Panel.hxx
index 8ab43b330130..485063f2152d 100644
--- a/include/sfx2/sidebar/Panel.hxx
+++ b/include/sfx2/sidebar/Panel.hxx
@@ -61,7 +61,7 @@ public:
     ~Panel();
 
     PanelTitleBar* GetTitleBar() const;
-    weld::Container* GetContents() const;
+    weld::Box* GetContents() const;
     void Show(bool bShow);
     bool IsTitleBarOptional() const { return mbIsTitleBarOptional; }
     void SetUIElement(const css::uno::Reference<css::ui::XUIElement>& rxElement);
@@ -108,9 +108,9 @@ private:
     const css::uno::Reference<css::frame::XFrame>& mxFrame;
     weld::Widget* mpParentWindow;
     VclPtr<Deck> mxDeck;
-    std::unique_ptr<weld::Container> mxContainer;
+    std::unique_ptr<weld::Box> mxContainer;
     std::unique_ptr<PanelTitleBar> mxTitleBar;
-    std::unique_ptr<weld::Container> mxContents;
+    std::unique_ptr<weld::Box> mxContents;
     css::uno::Reference<css::awt::XWindow> mxXWindow;
 
     DECL_LINK(DumpAsPropertyTreeHdl, tools::JsonWriter&, void);
diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index 074a0bad7466..394c767001c2 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -51,7 +51,7 @@ Deck::Deck(const DeckDescriptor& rDeckDescriptor, SidebarDockingWindow* pParentW
     , mxParentWindow(pParentWindow)
     , mxTitleBar(new DeckTitleBar(rDeckDescriptor.msTitle, *m_xBuilder, rCloserAction))
     , mxVerticalScrollBar(m_xBuilder->weld_scrolled_window("scrolledwindow"))
-    , mxContents(m_xBuilder->weld_container("contents"))
+    , mxContents(m_xBuilder->weld_box("contents"))
 {
     SetStyle(GetStyle() | WB_DIALOGCONTROL);
 
diff --git a/sfx2/source/sidebar/Panel.cxx b/sfx2/source/sidebar/Panel.cxx
index 2d799a32d10a..61b9370f8e26 100644
--- a/sfx2/source/sidebar/Panel.cxx
+++ b/sfx2/source/sidebar/Panel.cxx
@@ -63,9 +63,9 @@ Panel::Panel(const PanelDescriptor& rPanelDescriptor,
     , mxFrame(rxFrame)
     , mpParentWindow(pParentWindow)
     , mxDeck(pDeck)
-    , mxContainer(mxBuilder->weld_container("Panel"))
+    , mxContainer(mxBuilder->weld_box("Panel"))
     , mxTitleBar(new PanelTitleBar(rPanelDescriptor.msTitle, *mxBuilder, this))
-    , mxContents(mxBuilder->weld_container("contents"))
+    , mxContents(mxBuilder->weld_box("contents"))
 {
     mxContents->set_visible(mbIsExpanded);
     mxContainer->connect_get_property_tree(LINK(this, Panel, DumpAsPropertyTreeHdl));
@@ -149,7 +149,7 @@ PanelTitleBar* Panel::GetTitleBar() const
     return mxTitleBar.get();
 }
 
-weld::Container* Panel::GetContents() const
+weld::Box* Panel::GetContents() const
 {
     return mxContents.get();
 }
diff --git a/sfx2/uiconfig/ui/panel.ui b/sfx2/uiconfig/ui/panel.ui
index b6995f386bbd..769acfddc2b2 100644
--- a/sfx2/uiconfig/ui/panel.ui
+++ b/sfx2/uiconfig/ui/panel.ui
@@ -2,10 +2,10 @@
 <!-- Generated with glade 3.38.2 -->
 <interface domain="sfx">
   <requires lib="gtk+" version="3.20"/>
-  <!-- n-columns=1 n-rows=2 -->
-  <object class="GtkGrid" id="Panel">
+  <object class="GtkBox" id="Panel">
     <property name="visible">True</property>
     <property name="can-focus">False</property>
+    <property name="orientation">vertical</property>
     <child>
       <object class="GtkBox" id="titlebar">
         <property name="visible">True</property>
@@ -96,8 +96,9 @@
         </child>
       </object>
       <packing>
-        <property name="left-attach">0</property>
-        <property name="top-attach">0</property>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">0</property>
       </packing>
     </child>
     <child>
@@ -111,8 +112,9 @@
         </child>
       </object>
       <packing>
-        <property name="left-attach">0</property>
-        <property name="top-attach">1</property>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">1</property>
       </packing>
     </child>
   </object>