Bug 1736795 [Linux] Export titlebar radius as int from LookAndFeel, r=emilio

Titlebar radius is exported as integer from Gtk so there's no need to use floats here.

Differential Revision: https://phabricator.services.mozilla.com/D128993

servo/components/style/gecko/media_queries.rs

@@ -371,7 +371,7 @@ impl Device {
     /// Returns the gtk titlebar radius in CSS pixels.
     pub fn titlebar_radius(&self) -> f32 {
         unsafe {
-            bindings::Gecko_GetLookAndFeelFloat(bindings::LookAndFeel_FloatID::TitlebarRadius as i32)
+            bindings::Gecko_GetLookAndFeelInt(bindings::LookAndFeel_IntID::TitlebarRadius as i32) as f32
         }
     }
 

widget/LookAndFeel.h

@@ -337,6 +337,9 @@ class LookAndFeel {
     /** A boolean value to determine whether a touch device is present */
     TouchDeviceSupportPresent,
 
+    /** GTK titlebar radius */
+    TitlebarRadius,
+
     /*
      * Not an ID; used to define the range of valid IDs.  Must be last.
      */
@@ -397,9 +400,6 @@ class LookAndFeel {
     // GTK text scale factor.
     TextScaleFactor,
 
-    // GTK titlebar radius.
-    TitlebarRadius,
-
     // Not an ID; used to define the range of valid IDs.  Must be last.
     End,
   };

widget/gtk/nsLookAndFeel.cpp

@@ -832,6 +832,11 @@ nsresult nsLookAndFeel::NativeGetInt(IntID aID, int32_t& aResult) {
       aResult = mSystemTheme.mHighContrast;
       break;
     }
+    case IntID::TitlebarRadius: {
+      EnsureInit();
+      aResult = EffectiveTheme().mTitlebarRadius;
+      break;
+    }
     case IntID::AllowOverlayScrollbarsOverlap: {
       aResult = 1;
       break;
@@ -872,10 +877,6 @@ nsresult nsLookAndFeel::NativeGetFloat(FloatID aID, float& aResult) {
       EnsureInit();
       aResult = mSystemTheme.mCaretRatio;
       break;
-    case FloatID::TitlebarRadius:
-      EnsureInit();
-      aResult = EffectiveTheme().mTitlebarRadius;
-      break;
     case FloatID::TextScaleFactor:
       aResult = gfxPlatformGtk::GetFontScaleFactor();
       break;
@@ -1555,15 +1556,15 @@ void nsLookAndFeel::PerThemeData::Init() {
     gtk_style_context_get_property(style, "border-radius",
                                    GTK_STATE_FLAG_NORMAL, &value);
 
-    mTitlebarRadius = [&]() -> float {
+    mTitlebarRadius = [&]() -> int {
       auto type = G_VALUE_TYPE(&value);
       if (type == G_TYPE_INT) {
-        return float(g_value_get_int(&value));
+        return g_value_get_int(&value);
       }
       NS_WARNING(
           nsPrintfCString("Unknown value type %lu for titlebar radius", type)
               .get());
-      return 0.0f;
+      return 0;
     }();
     g_value_unset(&value);
   }
@@ -1827,7 +1828,7 @@ void nsLookAndFeel::PerThemeData::Init() {
              GetColorPrefName(id), NS_SUCCEEDED(rv),
              NS_SUCCEEDED(rv) ? color : 0);
     }
-    LOGLNF(" * titlebar-radius: %f\n", mTitlebarRadius);
+    LOGLNF(" * titlebar-radius: %d\n", mTitlebarRadius);
   }
 }
 

widget/gtk/nsLookAndFeel.h

@@ -123,7 +123,7 @@ class nsLookAndFeel final : public nsXPLookAndFeel {
     nscolor mThemedScrollbarThumbInactive = kBlack;
 
     float mCaretRatio = 0.0f;
-    float mTitlebarRadius = 0.0f;
+    int32_t mTitlebarRadius = 0;
     char16_t mInvisibleCharacter = 0;
     bool mMenuSupportsDrag = false;
 

widget/gtk/nsWindow.cpp

@@ -6102,8 +6102,7 @@ void nsWindow::UpdateWindowDraggingRegion(
 }
 
 LayoutDeviceIntCoord nsWindow::GetTitlebarRadius() {
-  int32_t cssCoord =
+  int32_t cssCoord = LookAndFeel::GetInt(LookAndFeel::IntID::TitlebarRadius);
-      std::ceil(LookAndFeel::GetFloat(LookAndFeel::FloatID::TitlebarRadius));
   return GdkCoordToDevicePixels(cssCoord);
 }
 
@@ -6359,7 +6358,8 @@ LayoutDeviceIntRect nsWindow::GetTitlebarRect() {
     return LayoutDeviceIntRect();
   }
 
-  return LayoutDeviceIntRect(0, 0, mBounds.width, GetTitlebarRadius());
+  int radius = DoDrawTilebarCorners() ? int(GetTitlebarRadius()) : 0;
+  return LayoutDeviceIntRect(0, 0, mBounds.width, radius);
 }
 
 void nsWindow::UpdateTitlebarTransparencyBitmap() {

widget/nsXPLookAndFeel.cpp

@@ -175,6 +175,7 @@ static const char sIntPrefs[][43] = {
     "ui.systemVerticalScrollbarWidth",
     "ui.systemHorizontalScrollbarHeight",
     "ui.touchDeviceSupportPresent",
+    "ui.titlebarRadius",
 };
 
 static_assert(ArrayLength(sIntPrefs) == size_t(LookAndFeel::IntID::End),
@@ -188,7 +189,6 @@ static const char sFloatPrefs[][37] = {
     "ui.SpellCheckerUnderlineRelativeSize",
     "ui.caretAspectRatio",
     "ui.textScaleFactor",
-    "ui.titlebarRadius",
 };
 // clang-format on