From 57dd855d103fb8f3c445f9754acbdcc02e40d4c5 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sat, 19 Dec 2015 23:24:27 -0500
Subject: [PATCH] Adwaita: Drop some deprecated style properties

These can now be replaces with min-width/min-height.
---
 gtk/theme/Adwaita/_common.scss           | 18 ++++++++----------
 gtk/theme/Adwaita/gtk-contained-dark.css | 14 ++++++++------
 gtk/theme/Adwaita/gtk-contained.css      | 14 ++++++++------
 3 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index 52429d03a5..8dbd62d6da 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -10,7 +10,6 @@ $asset_suffix: if($variant=='dark', '-dark', '');
   -GtkToolButton-icon-spacing: 4;
   -GtkTextView-error-underline-color: $error_color;
 
-  -GtkCheckButton-indicator-size: 16;
   -GtkCheckMenuItem-indicator-size: 16;
 
   // The size for scrollbars. The slider is 2px smaller, but we keep it
@@ -22,7 +21,6 @@ $asset_suffix: if($variant=='dark', '-dark', '');
   -GtkScrolledWindow-scrollbars-within-bevel: 1;
 
   -GtkToolItemGroup-expander-size: 11;
-  -GtkExpander-expander-size: 16;
   -GtkTreeView-expander-size: 11;
 
   -GtkTreeView-horizontal-separator: 4;
@@ -1942,11 +1940,6 @@ scrollbar {
  **********/
 
 switch {
-  @at-root * {
-    -GtkSwitch-slider-width: 45px;
-    -GtkSwitch-slider-height: 27px;
-  }
-
   font-weight: bold;
   font-size: smaller;
   outline-offset: -4px;
@@ -1996,9 +1989,9 @@ switch {
         background-image: none;
         background-color: $insensitive_bg_color;
   }
-  // slider styling
-  // switch slider doesn't respond to its own states but relies on the switch ones
   slider {
+    min-width: 45px;
+    min-height: 27px;
     border: 1px solid;
     border-radius: 3px;
     @include button(normal);
@@ -2146,6 +2139,8 @@ checkbutton.text-button, radiobutton.text-button {
 
 radiobutton radio,
 checkbutton check {
+  min-width: 16px;
+  min-height: 16px;
   margin: 0 2px 0 2px;
   &:only-child {
     margin: 0;
@@ -2420,7 +2415,8 @@ progressbar {
   &:backdrop progress { @extend %scale_highlight:backdrop; } // states not passed here as well
 
   &.osd {
-    -GtkProgressBar-min-horizontal-bar-height: 3;
+    min-width: 3px;
+    min-height: 3px;
     trough {
       border-style: none;
       border-radius: 0;
@@ -2701,6 +2697,8 @@ row {
 
 expander {
   & arrow {
+    min-width: 16px;
+    min-height: 16px;
     -gtk-icon-source: -gtk-icontheme('pan-end-symbolic');
     &:dir(rtl) { -gtk-icon-source: -gtk-icontheme('pan-end-symbolic-rtl'); }
     &:hover { color: lighten($fg_color,30%); } //only lightens the arrow
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index bd67454569..445f66184a 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -2,12 +2,10 @@
   padding: 0;
   -GtkToolButton-icon-spacing: 4;
   -GtkTextView-error-underline-color: #cc0000;
-  -GtkCheckButton-indicator-size: 16;
   -GtkCheckMenuItem-indicator-size: 16;
   -GtkScrolledWindow-scrollbar-spacing: 0;
   -GtkScrolledWindow-scrollbars-within-bevel: 1;
   -GtkToolItemGroup-expander-size: 11;
-  -GtkExpander-expander-size: 16;
   -GtkTreeView-expander-size: 11;
   -GtkTreeView-horizontal-separator: 4;
   -GtkWidget-text-handle-width: 20;
@@ -2529,9 +2527,6 @@ switch {
   color: #eeeeec;
   background-image: linear-gradient(to bottom, #2d3232);
   text-shadow: 0 1px rgba(0, 0, 0, 0.1); }
-  * {
-    -GtkSwitch-slider-width: 45px;
-    -GtkSwitch-slider-height: 27px; }
   switch:active {
     color: white;
     border-color: #0f2b48;
@@ -2562,6 +2557,8 @@ switch {
     background-image: none;
     background-color: #333636; }
   switch slider {
+    min-width: 45px;
+    min-height: 27px;
     border: 1px solid;
     border-radius: 3px;
     color: #eeeeec;
@@ -2994,6 +2991,8 @@ checkbutton.text-button, radiobutton.text-button {
 
 radiobutton radio,
 checkbutton check {
+  min-width: 16px;
+  min-height: 16px;
   margin: 0 2px 0 2px; }
   radiobutton radio:only-child,
   checkbutton check:only-child {
@@ -3419,7 +3418,8 @@ progressbar {
       border-bottom-right-radius: 3px;
       border-bottom-left-radius: 3px; }
   progressbar.osd {
-    -GtkProgressBar-min-horizontal-bar-height: 3; }
+    min-width: 3px;
+    min-height: 3px; }
     progressbar.osd trough {
       border-style: none;
       border-radius: 0;
@@ -3828,6 +3828,8 @@ row {
  * Expanders *
  *************/
 expander arrow {
+  min-width: 16px;
+  min-height: 16px;
   -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
   expander arrow:dir(rtl) {
     -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); }
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 78fc0f6103..434b44948f 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -2,12 +2,10 @@
   padding: 0;
   -GtkToolButton-icon-spacing: 4;
   -GtkTextView-error-underline-color: #cc0000;
-  -GtkCheckButton-indicator-size: 16;
   -GtkCheckMenuItem-indicator-size: 16;
   -GtkScrolledWindow-scrollbar-spacing: 0;
   -GtkScrolledWindow-scrollbars-within-bevel: 1;
   -GtkToolItemGroup-expander-size: 11;
-  -GtkExpander-expander-size: 16;
   -GtkTreeView-expander-size: 11;
   -GtkTreeView-horizontal-separator: 4;
   -GtkWidget-text-handle-width: 20;
@@ -2535,9 +2533,6 @@ switch {
   color: #2e3436;
   background-image: linear-gradient(to bottom, #cacac8);
   text-shadow: 0 1px rgba(0, 0, 0, 0.1); }
-  * {
-    -GtkSwitch-slider-width: 45px;
-    -GtkSwitch-slider-height: 27px; }
   switch:active {
     color: white;
     border-color: #184472;
@@ -2569,6 +2564,8 @@ switch {
     background-image: none;
     background-color: #f1f1f1; }
   switch slider {
+    min-width: 45px;
+    min-height: 27px;
     border: 1px solid;
     border-radius: 3px;
     color: #2e3436;
@@ -3156,6 +3153,8 @@ checkbutton.text-button, radiobutton.text-button {
 
 radiobutton radio,
 checkbutton check {
+  min-width: 16px;
+  min-height: 16px;
   margin: 0 2px 0 2px; }
   radiobutton radio:only-child,
   checkbutton check:only-child {
@@ -3581,7 +3580,8 @@ progressbar {
       border-bottom-right-radius: 3px;
       border-bottom-left-radius: 3px; }
   progressbar.osd {
-    -GtkProgressBar-min-horizontal-bar-height: 3; }
+    min-width: 3px;
+    min-height: 3px; }
     progressbar.osd trough {
       border-style: none;
       border-radius: 0;
@@ -3998,6 +3998,8 @@ row {
  * Expanders *
  *************/
 expander arrow {
+  min-width: 16px;
+  min-height: 16px;
   -gtk-icon-source: -gtk-icontheme("pan-end-symbolic"); }
   expander arrow:dir(rtl) {
     -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl"); }