nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'wip/christopherdavis/full-height-separator' into 'mainline'

Browse source 
main-toolbar: Use a full-height, splitting separator

Closes #389

See merge request GNOME/geary!212
This commit is contained in:
Michael Gratton 2019-04-19 03:16:21 +00:00
commit 9e44188240
2 changed files with 13 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/client/components/main-toolbar.vala
View file

@ -67,18 +67,10 @@ public class MainToolbar : Gtk.Box {
public MainToolbar(Configuration config) {
// Instead of putting a separator between the two headerbars, as other applications do,
// we put a separator at the right end of the left headerbar. This greatly improves
// the appearance under the Ambiance theme (see bug #746171). To get this separator to
// line up with the handle of the pane, we need to extend the width of the left-hand
// headerbar a bit. Six pixels is right both for Adwaita and Ambiance.
// Sync headerbar width with left pane
config.bind(Configuration.MESSAGES_PANE_POSITION_KEY, this, "left-pane-width",
SettingsBindFlags.GET);
this.bind_property("left-pane-width", this.folder_header, "width-request",
BindingFlags.SYNC_CREATE, (binding, source_value, ref target_value) => {
target_value = left_pane_width + 6;
return true;
});
this.bind_property("left-pane-width", this.folder_header, "width-request", BindingFlags.SYNC_CREATE);
if (config.desktop_environment != Configuration.DesktopEnvironment.UNITY) {
this.bind_property("account", this.folder_header, "title", BindingFlags.SYNC_CREATE);

23
ui/main-toolbar.ui
View file

@ -32,17 +32,6 @@
</child>
</object>
</child>
<child>
<object class="GtkSeparator" id="header_separator">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
</object>
<packing>
<property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkToggleButton" id="search_conversations_button">
<property name="visible">True</property>
@ -95,6 +84,16 @@
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkSeparator" id="header_separator">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkHeaderBar" id="conversation_header">
<property name="visible">True</property>
@ -359,7 +358,7 @@
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
<property name="position">2</property>
</packing>
</child>
</template>