svx/uiconfig/ui/inspectortextpanel.ui | 91 +++++++++++++--------------- sw/source/uibase/sidebar/SwPanelFactory.cxx | 2 2 files changed, 44 insertions(+), 49 deletions(-)
New commits: commit afd2263f3effce76791f672e79c02498509cafa9 Author: Caolán McNamara <[email protected]> AuthorDate: Thu Jul 30 10:20:14 2020 +0100 Commit: Mike Kaganski <[email protected]> CommitDate: Thu Jul 30 12:44:57 2020 +0200 Resolves: tdf#134831 reorg to expand inspector to fit full panel size Change-Id: I73e37dff01d67f04ea5a2a82e4083ffd5bd46440 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99774 Tested-by: Heiko Tietze <[email protected]> Reviewed-by: Heiko Tietze <[email protected]> diff --git a/svx/uiconfig/ui/inspectortextpanel.ui b/svx/uiconfig/ui/inspectortextpanel.ui index 0b2de5a225f4..3454a32758db 100644 --- a/svx/uiconfig/ui/inspectortextpanel.ui +++ b/svx/uiconfig/ui/inspectortextpanel.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.20.4 --> +<!-- Generated with glade 3.36.0 --> <interface domain="svx"> <requires lib="gtk+" version="3.18"/> <object class="GtkTreeStore" id="liststore"> @@ -23,79 +23,74 @@ <object class="GtkGrid" id="InspectorTextPanel"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> <property name="row_spacing">6</property> <property name="column_spacing">6</property> <child> - <object class="GtkAlignment" id="alignment1"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> + <property name="border_width">6</property> + <property name="orientation">vertical</property> <child> - <object class="GtkGrid" id="grid1"> + <object class="GtkScrolledWindow"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="row_spacing">6</property> - <property name="column_spacing">6</property> + <property name="shadow_type">in</property> <child> - <object class="GtkScrolledWindow"> + <object class="GtkTreeView" id="listbox_fonts"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="receives_default">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> - <property name="shadow_type">in</property> + <property name="model">liststore</property> + <property name="search_column">0</property> + <property name="enable_tree_lines">True</property> + <child internal-child="selection"> + <object class="GtkTreeSelection"/> + </child> <child> - <object class="GtkTreeView" id="listbox_fonts"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="model">liststore</property> - <property name="search_column">0</property> - <property name="enable_tree_lines">True</property> - <child internal-child="selection"> - <object class="GtkTreeSelection"/> - </child> + <object class="GtkTreeViewColumn" id="treeviewcolumn1"> + <property name="resizable">True</property> + <property name="title" translatable="yes" context="inspectortextpanel|property">Properties</property> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn1"> - <property name="resizable">True</property> - <property name="title" translatable="yes" context="inspectortextpanel|property">Properties</property> - <child> - <object class="GtkCellRendererText" id="cellrenderertext1"/> - <attributes> - <attribute name="sensitive">5</attribute> - <attribute name="text">0</attribute> - <attribute name="weight">3</attribute> - </attributes> - </child> - </object> + <object class="GtkCellRendererText" id="cellrenderertext1"/> + <attributes> + <attribute name="sensitive">5</attribute> + <attribute name="text">0</attribute> + <attribute name="weight">3</attribute> + </attributes> </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn2"> + <property name="resizable">True</property> + <property name="title" translatable="yes" context="inspectortextpanel|value">Values</property> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn2"> - <property name="resizable">True</property> - <property name="title" translatable="yes" context="inspectortextpanel|value">Values</property> - <child> - <object class="GtkCellRendererText" id="cellrenderertext2"/> - <attributes> - <attribute name="sensitive">6</attribute> - <attribute name="text">1</attribute> - <attribute name="weight">4</attribute> - </attributes> - </child> - </object> + <object class="GtkCellRendererText" id="cellrenderertext2"/> + <attributes> + <attribute name="sensitive">6</attribute> + <attribute name="text">1</attribute> + <attribute name="weight">4</attribute> + </attributes> </child> </object> </child> </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> </child> </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> </child> </object> <packing> diff --git a/sw/source/uibase/sidebar/SwPanelFactory.cxx b/sw/source/uibase/sidebar/SwPanelFactory.cxx index b073b2801733..68e5c0684d6a 100644 --- a/sw/source/uibase/sidebar/SwPanelFactory.cxx +++ b/sw/source/uibase/sidebar/SwPanelFactory.cxx @@ -177,7 +177,7 @@ Reference<ui::XUIElement> SAL_CALL SwPanelFactory::createUIElement ( rsResourceURL, xFrame, pPanel, - ui::LayoutSize(-1,-1,-1)); + ui::LayoutSize(0,-1,-1)); } else if (rsResourceURL.endsWith("/StylePresetsPanel")) { _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
