From 1b1d6551c712a57f5f69ccdae3b9dfd6c46600f9 Mon Sep 17 00:00:00 2001
From: Lapo Calamandrei <calamandrei@gmail.com>
Date: Mon, 15 Feb 2016 16:56:01 +0100
Subject: [PATCH] Adwaita: correct size for ssd titlebars

fixes https://bugzilla.gnome.org/show_bug.cgi?id=762032
---
 gtk/theme/Adwaita/_common.scss           | 10 ++++++----
 gtk/theme/Adwaita/gtk-contained-dark.css | 12 +++++++-----
 gtk/theme/Adwaita/gtk-contained.css      | 12 +++++++-----
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index fb8d3e63db..7eb7b20497 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -1364,12 +1364,14 @@ headerbar {
   .maximized & { &:backdrop, & { border-radius: 0; }} // squared corners when the window is maximized or tiled
 
   &.default-decoration {
-    padding: 0 4px;
-    min-height: 36px;
+    padding: 4px;
+    min-height: 28px;
 
-    button {
+    button.titlebutton {
       min-height: 26px;
-      padding: 0 5px;
+      min-width: 26px;
+      margin: 0;
+      padding: 0;
     }
   }
 
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 5a426c2aaa..3bde8fd504 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -1835,12 +1835,14 @@ headerbar {
     border-radius: 0; }
   .default-decoration.titlebar:not(headerbar),
   headerbar.default-decoration {
-    padding: 0 4px;
-    min-height: 36px; }
-    .default-decoration.titlebar:not(headerbar) button,
-    headerbar.default-decoration button {
+    padding: 4px;
+    min-height: 28px; }
+    .default-decoration.titlebar:not(headerbar) button.titlebutton,
+    headerbar.default-decoration button.titlebutton {
       min-height: 26px;
-      padding: 0 5px; }
+      min-width: 26px;
+      margin: 0;
+      padding: 0; }
   .titlebar:not(headerbar) entry, .titlebar:not(headerbar) spinbutton:not(.vertical),
   .titlebar:not(headerbar) spinbutton,
   .titlebar:not(headerbar) separator,
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 16c41bb777..fced9382d9 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -1839,12 +1839,14 @@ headerbar {
     border-radius: 0; }
   .default-decoration.titlebar:not(headerbar),
   headerbar.default-decoration {
-    padding: 0 4px;
-    min-height: 36px; }
-    .default-decoration.titlebar:not(headerbar) button,
-    headerbar.default-decoration button {
+    padding: 4px;
+    min-height: 28px; }
+    .default-decoration.titlebar:not(headerbar) button.titlebutton,
+    headerbar.default-decoration button.titlebutton {
       min-height: 26px;
-      padding: 0 5px; }
+      min-width: 26px;
+      margin: 0;
+      padding: 0; }
   .titlebar:not(headerbar) entry, .titlebar:not(headerbar) spinbutton:not(.vertical),
   .titlebar:not(headerbar) spinbutton,
   .titlebar:not(headerbar) separator,