summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Dywan <christian@twotoasts.de>2019-02-18 23:15:27 +0100
committerGitHub <noreply@github.com>2019-02-18 23:15:27 +0100
commit494c7e8a0efe5afd8a1ed5a843850e9629c519c3 (patch)
treef1e0ab58fe7e0519085b2fab6f1e487e1b5a89f5
parent738636d6677272179ff8655595b4dfa1805ebb7c (diff)
downloadmidori-git-494c7e8a0efe5afd8a1ed5a843850e9629c519c3.tar.gz
Headerbar by default only under Budgie, GNOME and Pantheon (#258)
Semi-related to #216
-rw-r--r--core/browser.vala12
1 files changed, 11 insertions, 1 deletions
diff --git a/core/browser.vala b/core/browser.vala
index 03ec9ed1..487c2bf1 100644
--- a/core/browser.vala
+++ b/core/browser.vala
@@ -304,8 +304,18 @@ namespace Midori {
Gtk.StyleContext.add_provider_for_screen (get_screen (), provider,
Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
+ // Headerbar 1) by default under Budgie, GNOME and Pantheon 2) as per GTK_CSD
+ bool use_headerbar = Regex.match_simple (
+ "budgie|gnome|pantheon", Environment.get_variable ("XDG_CURRENT_DESKTOP"),
+ RegexCompileFlags.CASELESS, RegexMatchFlags.NOTEMPTY);
+ if (Environment.get_variable ("GTK_CSD") == "1") {
+ use_headerbar = true;
+ } else if (Environment.get_variable ("GTK_CSD") == "0") {
+ use_headerbar = false;
+ }
+ get_settings ().gtk_dialogs_use_header = use_headerbar;
+
// Make headerbar (titlebar) the topmost bar if CSD is disabled
- get_settings ().gtk_dialogs_use_header = Environment.get_variable ("GTK_CSD") != "0";
if (!get_settings ().gtk_dialogs_use_header) {
var titlebar = get_titlebar ();
titlebar.ref ();