New upstream snapshot for GTK4

ubuntu · Sep 6, 2024 · f3cf0a3 · f3cf0a3
1 parent 3763172
commit f3cf0a3
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 12 deletions.
diff --git a/gtk/upstream/gtk-4.0/Default/_colors-public.scss b/gtk/upstream/gtk-4.0/Default/_colors-public.scss
@@ -93,22 +93,22 @@ $_wm_highlight: if($variant=='light', $top_hilight,  // Sass gets mad if this is
 /*
 these colors are exported for the window manager and shouldn't be used in applications,
 read if you used those and something break with a version upgrade you're on your own... */
-@define-color wm_title shade(#{$fg_color}, 1.8);
+@define-color wm_title hsl(from #{$fg_color} h calc(s * 1.8) calc(l * 1.8));
 @define-color wm_unfocused_title #{$backdrop_fg_color};
 @define-color wm_highlight #{"" + $_wm_highlight};
 @define-color wm_borders_edge #{"" + $borders_edge};
 
-@define-color wm_bg_a shade(#{$bg_color}, 1.2);
+@define-color wm_bg_a hsl(from #{$bg_color} h calc(s * 1.2) calc(l * 1.2));
 @define-color wm_bg_b #{$bg_color};
 
-@define-color wm_shadow alpha(black, 0.35);
-@define-color wm_border alpha(black, 0.18);
+@define-color wm_shadow rgb(from black r g b / calc(alpha * 0.35));
+@define-color wm_border rgb(from black r g b / calc(alpha * 0.18));
 
-@define-color wm_button_hover_color_a shade(#{$bg_color}, 1.3);
+@define-color wm_button_hover_color_a hsl(from #{$bg_color} h calc(s * 1.3) calc(l * 1.3));
 @define-color wm_button_hover_color_b #{$bg_color};
-@define-color wm_button_active_color_a shade(#{$bg_color}, 0.85);
-@define-color wm_button_active_color_b shade(#{$bg_color}, 0.89);
-@define-color wm_button_active_color_c shade(#{$bg_color}, 0.9);
+@define-color wm_button_active_color_a hsl(from #{$bg_color} h calc(s * 0.85) calc(l * 0.85));
+@define-color wm_button_active_color_b hsl(from #{$bg_color} h calc(s * 0.89) calc(l * 0.89));
+@define-color wm_button_active_color_c hsl(from #{$bg_color} h calc(s * 0.9) calc(l * 0.9));
 
 //FIXME this is really an API
 

diff --git a/gtk/upstream/gtk-4.0/Default/_common.scss b/gtk/upstream/gtk-4.0/Default/_common.scss
@@ -1,5 +1,5 @@
 @function gtkalpha($c,$a) {
-  @return unquote("alpha(#{$c},#{$a})");
+  @return unquote("rgb(from #{$c} r g b / calc(alpha * #{$a}))");
 }
 
 $ease-out-quad: cubic-bezier(0.25, 0.46, 0.45, 0.94);
@@ -2702,6 +2702,7 @@ scale {
   // sizing
   $_marks_length: 6px;
   $_marks_distance: 6px;
+  $_marks_size: $_marks_length + $_marks_distance;
 
   min-height: 10px;
   min-width: 10px;
@@ -2837,6 +2838,14 @@ scale {
       }
     }
 
+    &:not(.marks-before) {
+      > value.top { margin-bottom: $_marks_size; }
+    }
+
+    &:not(.marks-after) {
+      > value.bottom { margin-top: $_marks_size; }
+    }
+
     > value.left  { margin-right: 9px; }
     > value.right { margin-left: 9px; }
 
@@ -2861,6 +2870,14 @@ scale {
       }
     }
 
+    &:not(.marks-before) {
+      > value.left { margin-right: $_marks_size; }
+    }
+
+    &:not(.marks-after) {
+      > value.right { margin-left: $_marks_size; }
+    }
+
     > value.top    { margin-bottom: 9px; }
     > value.bottom { margin-top: 9px; }
 
@@ -3940,9 +3957,6 @@ video {
     min-height: 64px;
     border-radius: 32px;
   }
-  & graphicsoffload > picture {
-    background: black;
-  }
 }
 
 /************