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

Show HeaderBar close buttons by default

Browse source 
Only disable under Unity where they aren't desirable.
This commit is contained in:
Michael Gratton 2019-11-18 15:29:39 +11:00
parent 446e9b8699
commit ccb1135961
5 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/client/application/application-main-window.vala
View file

@ -962,9 +962,9 @@ public class Application.MainWindow :
this.main_toolbar.bind_property("find-open", this.conversation_viewer.conversation_find_bar,
"search-mode-enabled", BindingFlags.SYNC_CREATE | BindingFlags.BIDIRECTIONAL);
if (config.desktop_environment == UNITY) {
this.main_toolbar.show_close_button = false;
this.main_layout.pack_start(main_toolbar, false, true, 0);
} else {
main_toolbar.show_close_button = true;
set_titlebar(this.main_toolbar);
}

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

@ -13,7 +13,7 @@ public class MainToolbar : Gtk.Box {
public string account { get; set; }
public string folder { get; set; }
// Close button settings
public bool show_close_button { get; set; default = false; }
public bool show_close_button { get; set; default = true; }
public bool show_close_button_left { get; private set; default = true; }
public bool show_close_button_right { get; private set; default = true; }
// Search and find bar
@ -115,7 +115,6 @@ public class MainToolbar : Gtk.Box {
header.get_style_context().remove_class("geary-titlebar");
header.get_style_context().remove_class("geary-titlebar-right");
guest_header_binding.unbind();
header.show_close_button = false;
header.decoration_layout = Gtk.Settings.get_default().gtk_decoration_layout;
conversation_header.show();
}

2
src/client/composer/composer-window.vala
View file

@ -42,9 +42,9 @@ public class Composer.Window : Gtk.ApplicationWindow, Container {
this.composer.update_window_title();
if (application.config.desktop_environment == UNITY) {
composer.header.show_close_button = false;
composer.embed_header();
} else {
composer.header.show_close_button = true;
set_titlebar(this.composer.header);
}

1
ui/composer-headerbar.ui
View file

@ -5,6 +5,7 @@
<template class="ComposerHeaderbar" parent="GtkHeaderBar">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="show_close_button">True</property>
<child>
<object class="GtkBox" id="detach_start">
<property name="visible">True</property>

1
ui/main-toolbar.ui
View file

@ -100,6 +100,7 @@
<object class="GtkHeaderBar" id="conversation_header">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="show_close_button">True</property>
<child>
<object class="GtkBox" id="reply_forward_buttons">
<property name="visible">True</property>