bug 1324256 consider scrollbar trough borders even for GTK versions < 3.20 r=jhorak+328198
authorKarl Tomlinson <karlt+@karlt.net>
Mon, 09 Jan 2017 19:33:27 +1300
changeset 374199 8ed800907773f058ac33a5a3b602fcf51432602c
parent 374198 01050a98e53e9ae27fd281a4f3f88555fd10ad21
child 374200 164dd8cbfe85ad438b1286472700eddda27190ab
push id6996
push userjlorenzo@mozilla.com
push dateMon, 06 Mar 2017 20:48:21 +0000
treeherdermozilla-beta@d89512dab048 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjhorak
bugs1324256, 328198
milestone53.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
bug 1324256 consider scrollbar trough borders even for GTK versions < 3.20 r=jhorak+328198 This is needed for GTK themes with non-zero trough-border such as Greybird. MozReview-Commit-ID: 8ERxq5Nia6F
widget/gtk/nsNativeThemeGTK.cpp
--- a/widget/gtk/nsNativeThemeGTK.cpp
+++ b/widget/gtk/nsNativeThemeGTK.cpp
@@ -421,28 +421,20 @@ nsNativeThemeGTK::GetGtkWidgetAndState(u
   case NS_THEME_SCROLLBAR_HORIZONTAL:
     aGtkWidgetType = MOZ_GTK_SCROLLBAR_HORIZONTAL;
     if (GetWidgetTransparency(aFrame, aWidgetType) == eOpaque)
         *aWidgetFlags = MOZ_GTK_TRACK_OPAQUE;
     else
         *aWidgetFlags = 0;
     break;
   case NS_THEME_SCROLLBARTRACK_HORIZONTAL:
-    if (gtk_check_version(3,20,0) == nullptr) {
-      aGtkWidgetType = MOZ_GTK_SCROLLBAR_TROUGH_HORIZONTAL;
-    } else {
-      return false;
-    }
+    aGtkWidgetType = MOZ_GTK_SCROLLBAR_TROUGH_HORIZONTAL;
     break;
   case NS_THEME_SCROLLBARTRACK_VERTICAL:
-    if (gtk_check_version(3,20,0) == nullptr) {
-      aGtkWidgetType = MOZ_GTK_SCROLLBAR_TROUGH_VERTICAL;
-    } else {
-      return false;
-    }
+    aGtkWidgetType = MOZ_GTK_SCROLLBAR_TROUGH_VERTICAL;
     break;
   case NS_THEME_SCROLLBARTHUMB_VERTICAL:
     aGtkWidgetType = MOZ_GTK_SCROLLBAR_THUMB_VERTICAL;
     break;
   case NS_THEME_SCROLLBARTHUMB_HORIZONTAL:
     aGtkWidgetType = MOZ_GTK_SCROLLBAR_THUMB_HORIZONTAL;
     break;
   case NS_THEME_SPINNER: