Skip to content

Commit 648a624

Browse files
mtwebstermtwebster
committed
main.ui: Use GtkButtons instead of GtkToolButtons for the top row
controls. GtkToolButton sets its internal button to GTK_POS_LEFT, even when toolbar-style is GTK_TOOLBAR_BOTH (vertical stacking) - this ends up giving the label extra padding, and throwing off vertical centering between label and icon. Fixes #1024.
1 parent 644220b commit 648a624

1 file changed

Lines changed: 80 additions & 17 deletions

File tree

  • usr/share/linuxmint/mintupdate

‎usr/share/linuxmint/mintupdate/main.ui‎

Lines changed: 80 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,31 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!-- Generated with glade 3.38.2 -->
2+
<!-- Generated with glade 3.40.0 -->
33
<interface>
44
<requires lib="gtk+" version="3.18"/>
5+
<object class="GtkImage" id="clear_button_image">
6+
<property name="visible">True</property>
7+
<property name="can-focus">False</property>
8+
<property name="icon-name">xsi-edit-clear-symbolic</property>
9+
<property name="icon_size">2</property>
10+
</object>
11+
<object class="GtkImage" id="install_button_image">
12+
<property name="visible">True</property>
13+
<property name="can-focus">False</property>
14+
<property name="icon-name">mintupdate-action-install-symbolic</property>
15+
<property name="icon_size">2</property>
16+
</object>
17+
<object class="GtkImage" id="refresh_button_image">
18+
<property name="visible">True</property>
19+
<property name="can-focus">False</property>
20+
<property name="icon-name">xsi-view-refresh-symbolic</property>
21+
<property name="icon_size">2</property>
22+
</object>
23+
<object class="GtkImage" id="select_all_button_image">
24+
<property name="visible">True</property>
25+
<property name="can-focus">False</property>
26+
<property name="icon-name">xsi-edit-select-all-symbolic</property>
27+
<property name="icon_size">2</property>
28+
</object>
529
<object class="GtkWindow" id="window">
630
<property name="can-focus">False</property>
731
<property name="window-position">center</property>
@@ -25,26 +49,45 @@
2549
<object class="GtkToolbar" id="toolbar">
2650
<property name="visible">True</property>
2751
<property name="can-focus">False</property>
28-
<property name="toolbar-style">both</property>
29-
<property name="icon_size">2</property>
52+
<!-- <property name="spacing">6</property> -->
3053
<child>
31-
<object class="GtkToolButton" id="clear_button">
54+
<object class="GtkToolItem">
3255
<property name="visible">True</property>
3356
<property name="can-focus">False</property>
34-
<property name="label" translatable="yes">Clear</property>
35-
<property name="icon-name">xsi-edit-clear-symbolic</property>
57+
<child>
58+
<object class="GtkButton" id="clear_button">
59+
<property name="label" translatable="yes">Clear</property>
60+
<property name="visible">True</property>
61+
<property name="can-focus">True</property>
62+
<property name="receives-default">False</property>
63+
<property name="image">clear_button_image</property>
64+
<property name="relief">none</property>
65+
<property name="image-position">top</property>
66+
<property name="always-show-image">True</property>
67+
</object>
68+
</child>
3669
</object>
3770
<packing>
3871
<property name="expand">False</property>
3972
<property name="homogeneous">True</property>
4073
</packing>
4174
</child>
4275
<child>
43-
<object class="GtkToolButton" id="select_all_button">
76+
<object class="GtkToolItem">
4477
<property name="visible">True</property>
4578
<property name="can-focus">False</property>
46-
<property name="label" translatable="yes">Select All</property>
47-
<property name="icon-name">xsi-edit-select-all-symbolic</property>
79+
<child>
80+
<object class="GtkButton" id="select_all_button">
81+
<property name="label" translatable="yes">Select All</property>
82+
<property name="visible">True</property>
83+
<property name="can-focus">True</property>
84+
<property name="receives-default">False</property>
85+
<property name="image">select_all_button_image</property>
86+
<property name="relief">none</property>
87+
<property name="image-position">top</property>
88+
<property name="always-show-image">True</property>
89+
</object>
90+
</child>
4891
</object>
4992
<packing>
5093
<property name="expand">False</property>
@@ -62,12 +105,22 @@
62105
</packing>
63106
</child>
64107
<child>
65-
<object class="GtkToolButton" id="refresh_button">
108+
<object class="GtkToolItem">
66109
<property name="visible">True</property>
67110
<property name="can-focus">False</property>
68-
<property name="label" translatable="yes">Refresh</property>
69-
<property name="use-underline">True</property>
70-
<property name="icon-name">xsi-view-refresh-symbolic</property>
111+
<child>
112+
<object class="GtkButton" id="refresh_button">
113+
<property name="label" translatable="yes">Refresh</property>
114+
<property name="visible">True</property>
115+
<property name="can-focus">True</property>
116+
<property name="receives-default">False</property>
117+
<property name="image">refresh_button_image</property>
118+
<property name="relief">none</property>
119+
<property name="use-underline">True</property>
120+
<property name="image-position">top</property>
121+
<property name="always-show-image">True</property>
122+
</object>
123+
</child>
71124
</object>
72125
<packing>
73126
<property name="expand">False</property>
@@ -85,12 +138,22 @@
85138
</packing>
86139
</child>
87140
<child>
88-
<object class="GtkToolButton" id="install_button">
141+
<object class="GtkToolItem">
89142
<property name="visible">True</property>
90143
<property name="can-focus">False</property>
91-
<property name="label" translatable="yes">Install Updates</property>
92-
<property name="use-underline">True</property>
93-
<property name="icon-name">mintupdate-action-install-symbolic</property>
144+
<child>
145+
<object class="GtkButton" id="install_button">
146+
<property name="label" translatable="yes">Install Updates</property>
147+
<property name="visible">True</property>
148+
<property name="can-focus">True</property>
149+
<property name="receives-default">False</property>
150+
<property name="image">install_button_image</property>
151+
<property name="relief">none</property>
152+
<property name="use-underline">True</property>
153+
<property name="image-position">top</property>
154+
<property name="always-show-image">True</property>
155+
</object>
156+
</child>
94157
</object>
95158
<packing>
96159
<property name="expand">False</property>

0 commit comments

Comments
 (0)