From 00f618ea1abf124c5be7582889173159fdcaefd2 Mon Sep 17 00:00:00 2001
From: Lapo Calamandrei <calamandrei@gmail.com>
Date: Fri, 31 Oct 2014 16:53:23 +0100
Subject: [PATCH] Adwaita: special case .default-decoration

Titlebars which are just window handles can be smaller.
---
 gtk/resources/theme/Adwaita/_common.scss      | 79 +++++++++++++------
 .../theme/Adwaita/gtk-contained-dark.css      |  6 ++
 gtk/resources/theme/Adwaita/gtk-contained.css |  6 ++
 3 files changed, 65 insertions(+), 26 deletions(-)

diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index ae70cc9771..4300ec8353 100644
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -1184,11 +1184,13 @@ GtkComboBox {
     font-weight: bold;
     padding: 0px 12px;
   }
+
   .subtitle {
     font-size: smaller;
     padding: 0 12px;
     @extend .dim-label;
   }
+
   .header-bar-separator,
   & > GtkBox > .separator.vertical {
     -GtkWidget-wide-separators: true;
@@ -1200,111 +1202,136 @@ GtkComboBox {
                                   $borders_color 70%,
                                   transparentize($borders_color,1) 100%)
                   0 1 / 0 1px stretch; //FIXME use a proper color
+
     &:backdrop {
-      border-image: linear-gradient(to bottom,
-                                    transparentize($backdrop_borders_color,
-                                                   0.5))
+      border-image: linear-gradient(to bottom, transparentize($backdrop_borders_color, 0.5))
                     0 1 / 1px 1px;  //FIXME use a proper color
     }
   }
+
   &.selection-mode {
     $_hc: mix($top_hilight,$selected_bg_color, 50%); // hilight color
+
     color: $selected_fg_color;
     text-shadow: 0 -1px transparentize(black, 0.5);
     border-color: $selected_borders_color;
     background-image: linear-gradient(to bottom,
                                       lighten($selected_bg_color,5%),
                                       $selected_bg_color);
-    box-shadow: inset 0 -1px mix($selected_borders_color,
-                                 $selected_bg_color, 35%), //bottom shade
+    box-shadow: inset 0 -1px mix($selected_borders_color, $selected_bg_color, 35%), //bottom shade
                 inset 0 1px $_hc;
+
     &:backdrop {
       background-image: linear-gradient(to bottom, $selected_bg_color);
       box-shadow: inset 0 1px mix($top_hilight,$selected_bg_color, 60%);
     }
+
     .subtitle:link { @extend *:link:selected;  }
+
     .button {
       @include button(normal, $selected_bg_color, $selected_fg_color, $_hc);
+
       &.flat { @include button(undecorated); }
-      &:hover { @include button(hover, $selected_bg_color, $selected_fg_color,
-                                $_hc); }
-      &:active, &:checked { @include button(active, $selected_bg_color,
-                                            $selected_fg_color, $_hc); }
-      &:backdrop, &.flat:backdrop {
+
+      &:hover { @include button(hover, $selected_bg_color, $selected_fg_color, $_hc); }
+
+      &:active, &:checked { @include button(active, $selected_bg_color, $selected_fg_color, $_hc); }
+
+      &:backdrop,
+      &.flat:backdrop {
         @include button(backdrop, $selected_bg_color, $selected_fg_color, $_hc);
         -gtk-image-effect: none;
         border-color: $selected_borders_color;
-        &:active, &:checked {
-          @include button(backdrop-active, $selected_bg_color,
-                          $selected_fg_color, $_hc);
+
+        &:active,
+        &:checked {
+          @include button(backdrop-active, $selected_bg_color, $selected_fg_color, $_hc);
           border-color: $selected_borders_color;
         }
+
         &:insensitive {
-          @include button(backdrop-insensitive, $selected_bg_color,
-                          $selected_fg_color, $_hc);
+          @include button(backdrop-insensitive, $selected_bg_color, $selected_fg_color, $_hc);
           border-color: $selected_borders_color;
         }
-        &:insensitive:active, &:insensitive:checked {
+
+        &:insensitive:active,
+        &:insensitive:checked {
           @include button(backdrop-insensitive-active, $selected_bg_color,
                           $selected_fg_color, $_hc);
           border-color: $selected_borders_color;
         }
       }
-      &.flat:backdrop, &.flat:insensitive, &.flat:insensitive:backdrop {
+
+      &.flat:backdrop,
+      &.flat:insensitive,
+      &.flat:insensitive:backdrop {
         @include button(undecorated);
       }
+
       &:insensitive {
-        @include button(insensitive, $selected_bg_color, $selected_fg_color,
-                        $_hc);
-        &:active, &:checked {
-          @include button(insensitive-active, $selected_bg_color,
-                          $selected_fg_color, $_hc);
-        }
+        @include button(insensitive, $selected_bg_color, $selected_fg_color, $_hc);
+
+        &:active, &:checked { @include button(insensitive-active, $selected_bg_color, $selected_fg_color, $_hc); }
       }
+
       &.suggested-action {
         @include button(normal, $edge:$_hc);
         border-color: $selected_borders_color;
+
         &:hover {
           @include button(hover, $edge:$_hc);
           border-color: $selected_borders_color;
         }
+
         &:active {
           @include button(active, $edge:$_hc);
           border-color: $selected_borders_color;
         }
+
         &:insensitive {
           @include button(insensitive, $edge:$_hc);
           border-color: $selected_borders_color;
         }
+
         &:backdrop {
           @include button(backdrop, $edge:$_hc);
           border-color: $selected_borders_color;
         }
+
         &:backdrop:insensitive {
           @include button(backdrop-insensitive, $edge:$_hc);
           border-color: $selected_borders_color;
         }
       }
     }
+
     .selection-menu {
-      border-color: transparentize($selected_bg_color,1);
-      background-image: linear-gradient(to bottom,
-                        transparentize($selected_bg_color,1));
+      border-color: transparentize($selected_bg_color, 1);
+      background-image: linear-gradient(to bottom, transparentize($selected_bg_color, 1));
       box-shadow: none;
       padding-left: 10px;
       padding-right: 10px;
+
       GtkArrow { -GtkArrow-arrow-scaling: 1; }
+
       .arrow {
         -gtk-icon-source: -gtk-icontheme('pan-down-symbolic');
         color: transparentize($selected_fg_color,0.5);
         icon-shadow: none;
       }
+
       &:backdrop { @extend .selection-menu };
     }
   }
+
   .tiled &, .maximized & {
     border-radius: 0; // squared corners when the window is max'd or tiled
   }
+
+  &.default-decoration {
+    padding: 4px;
+    .button { padding: 5px; }
+  }
 }
 
 /************
diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index f33746d9c0..9d6fcd6111 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -1880,6 +1880,12 @@ GtkComboBox {
   .header-bar, .maximized
   .header-bar {
     border-radius: 0; }
+  .titlebar.default-decoration,
+  .header-bar.default-decoration {
+    padding: 4px; }
+    .titlebar.default-decoration .button,
+    .header-bar.default-decoration .button {
+      padding: 5px; }
 
 /************
  * Pathbars *
diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index eb6f5e54e6..992e177325 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -1872,6 +1872,12 @@ GtkComboBox {
   .header-bar, .maximized
   .header-bar {
     border-radius: 0; }
+  .titlebar.default-decoration,
+  .header-bar.default-decoration {
+    padding: 4px; }
+    .titlebar.default-decoration .button,
+    .header-bar.default-decoration .button {
+      padding: 5px; }
 
 /************
  * Pathbars *