starmath/uiconfig/smath/ui/sidebarelements_math.ui | 144 ++++++---------------
1 file changed, 42 insertions(+), 102 deletions(-)
New commits:
commit b6e0528ca31341239cb4ba990141a66ad4b76d6c
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Tue May 17 11:55:11 2022 +0300
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue May 17 21:33:46 2022 +0200
Simplify the UI
Remove the intermediary containers, keeping those that are really
needed to create the necessary structure.
I'm curious, how much CPU could be wasted by the unused container
layers when calculating the layout.
Change-Id: I56bf13c52b4e14dcef6595d00223cd36f48793d0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134463
Tested-by: Jenkins
Tested-by: Caolán McNamara <caol...@redhat.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/starmath/uiconfig/smath/ui/sidebarelements_math.ui
b/starmath/uiconfig/smath/ui/sidebarelements_math.ui
index c645e7f8d349..3b18a2a9e301 100644
--- a/starmath/uiconfig/smath/ui/sidebarelements_math.ui
+++ b/starmath/uiconfig/smath/ui/sidebarelements_math.ui
@@ -8,146 +8,86 @@
<column type="gchararray"/>
</columns>
</object>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid" id="MathElementsPanel">
+ <object class="GtkPaned" id="MathElementsPanel">
<property name="visible">True</property>
<property name="can-focus">False</property>
+ <property name="orientation">vertical</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="border-width">6</property>
+ <property name="wide-handle">True</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid" id="container">
+ <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">3</property>
- <property name="column-spacing">6</property>
+ <property name="shadow-type">in</property>
<child>
- <object class="GtkPaned" id="splitter">
+ <object class="GtkTreeView" id="categorylist">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="orientation">vertical</property>
- <property name="wide-handle">True</property>
+ <property name="model">liststore1</property>
+ <property name="headers-visible">False</property>
+ <property name="search-column">0</property>
+ <property name="show-expanders">False</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection2"/>
+ </child>
<child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
+ <object class="GtkTreeViewColumn" id="treeviewcolumn0">
<child>
- <object class="GtkScrolledWindow">
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="shadow-type">in</property>
- <child>
- <object class="GtkTreeView" id="categorylist">
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="model">liststore1</property>
- <property name="headers-visible">False</property>
- <property name="search-column">0</property>
- <property name="show-expanders">False</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection"
id="treeview-selection2"/>
- </child>
- <child>
- <object class="GtkTreeViewColumn"
id="treeviewcolumn0">
- <child>
- <object class="GtkCellRendererText"
id="cellrenderertext1"/>
- <attributes>
- <attribute name="text">1</attribute>
- </attributes>
- </child>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">0</property>
- </packing>
+ <object class="GtkCellRendererText" id="cellrenderertext1"/>
+ <attributes>
+ <attribute name="text">1</attribute>
+ </attributes>
</child>
</object>
- <packing>
- <property name="resize">False</property>
- <property name="shrink">True</property>
- </packing>
</child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow">
+ <property name="visible">True</property>
+ <property name="can-focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="shadow-type">in</property>
+ <child>
+ <object class="GtkViewport">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
+ <property name="orientation">vertical</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="row-spacing">6</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
- <object class="GtkGrid">
+ <object class="GtkDrawingArea" id="element_selector">
<property name="visible">True</property>
- <property name="can-focus">False</property>
+ <property name="can-focus">True</property>
+ <property name="events">GDK_BUTTON_MOTION_MASK |
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK |
GDK_KEY_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK |
GDK_STRUCTURE_MASK | GDK_SCROLL_MASK | GDK_SMOOTH_SCROLL_MASK</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <child>
- <object class="GtkScrolledWindow" id="scrolledwindow">
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="shadow-type">in</property>
- <child>
- <object class="GtkViewport">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <child>
- <object class="GtkDrawingArea"
id="element_selector">
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="events">GDK_BUTTON_MOTION_MASK
| GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK |
GDK_KEY_RELEASE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK |
GDK_STRUCTURE_MASK | GDK_SCROLL_MASK | GDK_SMOOTH_SCROLL_MASK</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">0</property>
- </packing>
- </child>
</object>
<packing>
- <property name="left-attach">0</property>
- <property name="top-attach">0</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
- <packing>
- <property name="resize">True</property>
- <property name="shrink">True</property>
- </packing>
</child>
</object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">0</property>
- </packing>
</child>
</object>
<packing>
- <property name="left-attach">0</property>
- <property name="top-attach">0</property>
+ <property name="resize">True</property>
+ <property name="shrink">True</property>
</packing>
</child>
</object>
