luisgulo/WhiteSur-gtk-theme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed metacity issues

Browse Source
This commit is contained in:
vinceliuice 2022-02-20 14:48:48 +08:00
parent c4a89ed608
commit 5eeced77ff
3 changed files with 51 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
src/main/metacity-1/metacity-theme-3.xml
View File

@ -9,31 +9,31 @@
</info>
<!-- ::: CONSTANTS ::: -->
<constant name="C_titlebar_gradient_a" value="gtk:custom(titlebar_gradient_a,shade/gtk:bg[NORMAL]/1.07)" />
<constant name="C_titlebar_gradient_b" value="gtk:custom(titlebar_gradient_b,gtk:bg[NORMAL])" />
<constant name="C_border_focused" value="gtk:custom(wm_border_focused,shade/gtk:bg[NORMAL]/0.5)" />
<constant name="C_border_unfocused" value="gtk:custom(wm_border_unfocused,shade/gtk:bg[NORMAL]/0.6)" />
<constant name="C_title_focused" value="gtk:custom(wm_title_focused,blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.3)" />
<constant name="C_title_focused_shadow" value="gtk:custom(wm_title_focused_shadow,shade/gtk:bg[NORMAL]/1.1)" />
<constant name="C_title_unfocused" value="gtk:custom(wm_title_unfocused,blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.6)" />
<constant name="C_title_unfocused_shadow" value="gtk:custom(wm_title_unfocused_shadow,shade/gtk:bg[NORMAL]/1.05)" />
<constant name="C_titlebar_gradient_a" value="gtk:custom(titlebar_gradient_a,shade/gtk:bg[NORMAL]/1.07)"/>
<constant name="C_titlebar_gradient_b" value="gtk:custom(titlebar_gradient_b,gtk:bg[NORMAL])"/>
<constant name="C_border_focused" value="gtk:custom(wm_border_focused,shade/gtk:bg[NORMAL]/0.65)"/>
<constant name="C_border_unfocused" value="gtk:custom(wm_border_unfocused,shade/gtk:bg[NORMAL]/0.75)"/>
<constant name="C_title_focused" value="gtk:custom(wm_title_focused,blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.3)"/>
<constant name="C_title_focused_shadow" value="gtk:custom(wm_title_focused_shadow,shade/gtk:bg[NORMAL]/1.1)"/>
<constant name="C_title_unfocused" value="gtk:custom(wm_title_unfocused,blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.6)"/>
<constant name="C_title_unfocused_shadow" value="gtk:custom(wm_title_unfocused_shadow,shade/gtk:bg[NORMAL]/1.05)"/>
<constant name="C_background" value="gtk:bg[NORMAL]"/>
<constant name="C_highlight" value="gtk:custom(wm_highlight,gtk:base[NORMAL])"/>
<!-- ::: GEOMETRY ::: -->
<frame_geometry name="normal" title_scale="medium" rounded_top_left="8" rounded_top_right="8">
<frame_geometry name="normal" title_scale="medium" rounded_top_left="10" rounded_top_right="10">
<distance name="left_width" value="1" />
<distance name="right_width" value="1" />
<distance name="bottom_height" value="1" />
<distance name="left_titlebar_edge" value="4" />
<distance name="right_titlebar_edge" value="4" />
<distance name="title_vertical_pad" value="2" />
<distance name="left_titlebar_edge" value="12" />
<distance name="right_titlebar_edge" value="6" />
<distance name="title_vertical_pad" value="0" />
<aspect_ratio name="button" value="1.0" />
<border name="title_border" left="16" right="16" top="8" bottom="8" />
<border name="button_border" left="2" right="2" top="8" bottom="8" />
<border name="title_border" left="10" right="10" top="6" bottom="6" />
<border name="button_border" left="2" right="2" top="6" bottom="6" />
</frame_geometry>
<frame_geometry name="normal_unfocused" title_scale="medium" rounded_top_left="8" rounded_top_right="8" parent="normal" />
<frame_geometry name="normal_unfocused" title_scale="medium" rounded_top_left="10" rounded_top_right="10" parent="normal" />
<frame_geometry name="max" title_scale="medium" parent="normal" rounded_top_left="false" rounded_top_right="false">
<distance name="left_width" value="0" />
@ -50,9 +50,9 @@
</frame_geometry>
<frame_geometry name="small" title_scale="small" parent="normal" rounded_top_left="false" rounded_top_right="false">
<distance name="title_vertical_pad" value="2" />
<distance name="title_vertical_pad" value="0" />
<border name="title_border" left="16" right="16" top="0" bottom="0" />
<border name="button_border" left="2" right="2" top="40" bottom="0" />
<border name="button_border" left="2" right="2" top="0" bottom="0" />
</frame_geometry>
<frame_geometry name="small_unfocused" parent="small">
@ -177,27 +177,33 @@
</draw_ops>
<draw_ops name="rounded_border_focused">
<line color="C_border_focused" x1="8" y1="0" x2="width-8" y2="0" />
<line color="C_border_focused" x1="0" y1="height-1" x2="width-1" y2="height-1" />
<line color="C_border_focused" x1="0" y1="8" x2="0" y2="height-2" />
<line color="C_border_focused" x1="width-1" y1="8" x2="width-1" y2="height-2" />
<arc color="C_border_focused" x="0" y="0" width="8" height="8" start_angle="270" extent_angle="90" />
<arc color="C_border_focused" x="width-8" y="0" width="8" height="8" start_angle="0" extent_angle="90" />
<!-- double arcs for darker borders -->
<arc color="C_border_focused" x="0" y="0" width="8" height="8" start_angle="270" extent_angle="90" />
<arc color="C_border_focused" x="width-8" y="0" width="8" height="8" start_angle="0" extent_angle="90" />
<line color="C_border_focused" x1="12" y1="0" x2="width-13" y2="0" />
<line color="C_border_focused" x1="0" y1="height-1" x2="width-1" y2="height-1" />
<line color="C_border_focused" x1="0" y1="12" x2="0" y2="height-2" />
<line color="C_border_focused" x1="width-1" y1="12" x2="width-1" y2="height-2" />
<arc color="C_border_focused" x="0" y="0" width="25" height="25" start_angle="270" extent_angle="90" />
<arc color="C_border_focused" x="width-26" y="0" width="25" height="25" start_angle="0" extent_angle="90" />
<!-- double arcs for darker borders -->
<arc color="C_border_focused" x="0" y="0" width="25" height="25" start_angle="270" extent_angle="90" />
<arc color="C_border_focused" x="width-26" y="0" width="25" height="25" start_angle="0" extent_angle="90" />
<line color="C_highlight" x1="13" y1="1" x2="width - 14" y2="1"/>
<arc color="C_highlight" x="0" y="1" width="25" height="25" start_angle="270" extent_angle="90"/>
<arc color="C_highlight" x="width - 26" y="1" width="25" height="25" start_angle="0" extent_angle="90"/>
</draw_ops>
<draw_ops name="rounded_border_unfocused">
<line color="C_border_unfocused" x1="4" y1="0" x2="width-5" y2="0" />
<line color="C_border_unfocused" x1="0" y1="height-1" x2="width-1" y2="height-1" />
<line color="C_border_unfocused" x1="0" y1="4" x2="0" y2="height-2" />
<line color="C_border_unfocused" x1="width-1" y1="4" x2="width-1" y2="height-2" />
<arc color="C_border_unfocused" x="0" y="0" width="9" height="9" start_angle="270" extent_angle="90" />
<arc color="C_border_unfocused" x="width-10" y="0" width="9" height="9" start_angle="0" extent_angle="90" />
<!-- double arcs for darker borders -->
<arc color="C_border_unfocused" x="0" y="0" width="9" height="9" start_angle="270" extent_angle="90" />
<arc color="C_border_unfocused" x="width-10" y="0" width="9" height="9" start_angle="0" extent_angle="90" />
<line color="C_border_unfocused" x1="12" y1="0" x2="width-13" y2="0" />
<line color="C_border_unfocused" x1="0" y1="height-1" x2="width-1" y2="height-1" />
<line color="C_border_unfocused" x1="0" y1="12" x2="0" y2="height-2" />
<line color="C_border_unfocused" x1="width-1" y1="12" x2="width-1" y2="height-2" />
<arc color="C_border_unfocused" x="0" y="0" width="25" height="25" start_angle="270" extent_angle="90" />
<arc color="C_border_unfocused" x="width-26" y="0" width="25" height="25" start_angle="0" extent_angle="90" />
<!-- double arcs for darker borders -->
<arc color="C_border_unfocused" x="0" y="0" width="25" height="25" start_angle="270" extent_angle="90" />
<arc color="C_border_unfocused" x="width-26" y="0" width="25" height="25" start_angle="0" extent_angle="90" />
<line color="C_highlight" x1="13" y1="1" x2="width - 14" y2="1"/>
<arc color="C_highlight" x="0" y="1" width="25" height="25" start_angle="270" extent_angle="90"/>
<arc color="C_highlight" x="width - 26" y="1" width="25" height="25" start_angle="0" extent_angle="90"/>
</draw_ops>
<draw_ops name="dialog_fill_background">
@ -543,7 +549,6 @@
<piece position="entire_background" draw_ops="entire_background_focused" />
<piece position="titlebar" draw_ops="titlebar_fill_focused" />
<piece position="title" draw_ops="title_focused" />
<piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_focused" /></draw_ops></piece>
<button function="close" state="normal" draw_ops="close_focused" />
<button function="close" state="prelight" draw_ops="close_focused_prelight" />
<button function="close" state="pressed" draw_ops="close_focused_pressed" />
@ -576,7 +581,6 @@
<piece position="entire_background" draw_ops="entire_background_unfocused" />
<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
<piece position="title" draw_ops="title_unfocused" />
<piece position="overlay"><draw_ops><line x1="0" y1="height-1" x2="width" y2="height-1" color="C_border_unfocused" /></draw_ops></piece>
<button function="close" state="normal" draw_ops="close_unfocused" />
<button function="close" state="prelight" draw_ops="close_unfocused_prelight" />
<button function="close" state="pressed" draw_ops="close_unfocused_pressed" />

2
src/sass/_colors.scss
View File

@ -165,7 +165,7 @@ $sidebar_theme_color: if($variant == 'light', rgba(black, 0.12), r
//OSD colors
$osd_fg_color: if($colorscheme == 'nord', #dadada, #d3d7df);
$osd_bg_color: if($trans == 'true', rgba(if($darker == 'true', #1a1a1a, #2a2a2a), 0.9), if($darker == 'true', #1a1a1a, #2a2a2a));
$osd_bg_color: if($trans == 'true', rgba(if($darker == 'true', #1a1a1a, #2a2a2a), 0.9), if($darker == 'true', #1a1a1a, #2a2a2a));
@if $colorscheme == 'nord' {
$osd_bg_color: if($trans == 'true', rgba(if($darker == 'true', #16191e, #222730), 0.9), if($darker == 'true', #16191e, #222730));
}

14
src/sass/gtk/_colors-public.scss
View File

@ -36,19 +36,23 @@ $theme_text: currentColor;
@define-color content_view_bg #{"" + $base_color};
/* Very contrasty background for text views (@theme_text_color foreground) */
@define-color text_view_bg #{"" + if($variant == 'light', $base_color, darken($base_color,6%))};
@define-color text_view_bg #{"" + if($variant == 'light', $base_color, darken($base_color, 6%))};
//WM
$wm_highlight: lighten(opacify($header_highlight, 1), 10%);
$wm_bg_unfocused: opacify($header_bg_backdrop, 1);
$wm_borders_focused: if($variant == 'light', darken($header_bg, 15%), darken($header_bg, 20%));
$wm_borders_unfocused: if($variant == 'light', darken($header_bg, 10%), darken($header_bg, 15%));
@define-color wm_title alpha(#{"" + opacify($header_fg, 1)}, 0.8);
@define-color wm_unfocused_title alpha(#{"" + opacify($header_fg, 1)}, 0.5);
@define-color wm_bg #{"" + opacify($header_bg, 1)};
@define-color wm_bg_unfocused #{"" + $wm_bg_unfocused};
@define-color wm_bg_unfocused #{"" + opacify($header_bg_backdrop, 1)};
@define-color wm_highlight #{"" + $wm_highlight};
@define-color wm_border_focused #{"" + $wm_borders_focused};
@define-color wm_border_unfocused #{"" + $wm_borders_unfocused};
@define-color wm_highlight alpha(#{white}, 0.12);
@define-color wm_shadow alpha(#{black}, 0.75);
//WM Buttons