From 3129ab410786939ccfeb3ea33543090691cad84f Mon Sep 17 00:00:00 2001 From: EMH-Mark-I Date: Fri, 12 Jun 2020 23:05:03 -0500 Subject: [PATCH] CSD titlebutton icon fix This should fix the titlebutton symbolic icons as well as remove the double layer effect. The previous method that was used for our CSD titlebuttons was more of a hack since we didn't have the symbolic icons for it. --- .../actions/16/window-maximise-symbolic.png | 1 - .../actions/16/window-maximize-symbolic.png | 1 + ...indow-maximise.png => window-maximize.png} | Bin .../actions/16/window-minimize-symbolic.png | 1 + ...indow-minimise.png => window-minimize.png} | Bin .../gtk-3.0/buttons/window_button_normal.png | Bin 0 -> 7552 bytes .../gtk-3.0/buttons/window_button_pressed.png | Bin 0 -> 7682 bytes Theme/Chicago95/gtk-3.0/gtk-windowbuttons.css | 30 ++++++++++-------- 8 files changed, 18 insertions(+), 15 deletions(-) delete mode 120000 Icons/Chicago95/actions/16/window-maximise-symbolic.png create mode 120000 Icons/Chicago95/actions/16/window-maximize-symbolic.png rename Icons/Chicago95/actions/16/{window-maximise.png => window-maximize.png} (100%) create mode 120000 Icons/Chicago95/actions/16/window-minimize-symbolic.png rename Icons/Chicago95/actions/16/{window-minimise.png => window-minimize.png} (100%) create mode 100644 Theme/Chicago95/gtk-3.0/buttons/window_button_normal.png create mode 100644 Theme/Chicago95/gtk-3.0/buttons/window_button_pressed.png diff --git a/Icons/Chicago95/actions/16/window-maximise-symbolic.png b/Icons/Chicago95/actions/16/window-maximise-symbolic.png deleted file mode 120000 index 3e3a144..0000000 --- a/Icons/Chicago95/actions/16/window-maximise-symbolic.png +++ /dev/null @@ -1 +0,0 @@ -./window-maximise.png \ No newline at end of file diff --git a/Icons/Chicago95/actions/16/window-maximize-symbolic.png b/Icons/Chicago95/actions/16/window-maximize-symbolic.png new file mode 120000 index 0000000..db93082 --- /dev/null +++ b/Icons/Chicago95/actions/16/window-maximize-symbolic.png @@ -0,0 +1 @@ +window-maximize.png \ No newline at end of file diff --git a/Icons/Chicago95/actions/16/window-maximise.png b/Icons/Chicago95/actions/16/window-maximize.png similarity index 100% rename from Icons/Chicago95/actions/16/window-maximise.png rename to Icons/Chicago95/actions/16/window-maximize.png diff --git a/Icons/Chicago95/actions/16/window-minimize-symbolic.png b/Icons/Chicago95/actions/16/window-minimize-symbolic.png new file mode 120000 index 0000000..484939f --- /dev/null +++ b/Icons/Chicago95/actions/16/window-minimize-symbolic.png @@ -0,0 +1 @@ +window-minimize.png \ No newline at end of file diff --git a/Icons/Chicago95/actions/16/window-minimise.png b/Icons/Chicago95/actions/16/window-minimize.png similarity index 100% rename from Icons/Chicago95/actions/16/window-minimise.png rename to Icons/Chicago95/actions/16/window-minimize.png diff --git a/Theme/Chicago95/gtk-3.0/buttons/window_button_normal.png b/Theme/Chicago95/gtk-3.0/buttons/window_button_normal.png new file mode 100644 index 0000000000000000000000000000000000000000..e4d728ab53d260b2cd459d5b85c24d93d4c9c31b GIT binary patch literal 7552 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 WT&!c#r`G@?Lu@VWEQ-v$qW%j6+_`c9 literal 0 HcmV?d00001 diff --git a/Theme/Chicago95/gtk-3.0/buttons/window_button_pressed.png b/Theme/Chicago95/gtk-3.0/buttons/window_button_pressed.png new file mode 100644 index 0000000000000000000000000000000000000000..5485506195ccc427f5c26e5154467139f855e5bb GIT binary patch literal 7682 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 z zG=aci;&E^)nhGuo1DL{zL>v=tN<&fUNTewPhn=e6Z_)aHz8(gSPNg$Ya3lr=u7`%E z!Ko+$0gk5;88{Rb&7|R`dcc2iJ!S~WFV!FEXC~?86bfl(f|^NsJ;_nh0X#$bd=48B z{5f&|DCGYIH$#8AY5XVknXoBsYaV|y*gRPxS26c5&Hn&6#o)}Q16(2RuUwxAnF`B{ zA9T>?DH(WB0M8wWZwHU*vIV!~pL|WXgMZQl6#CQ1--_?gaQzI|--^KB0{_gepW*sj z5%^o+pV{?a3zz)&M;8DWJcx_I2NPB%V(^g`M3&}cZv*L&ylEQ;Zh#UwzJsq20#TSR z`A9*I9Mc4ab3~35+c~df6{VGows^-lfFc)18!InD9X&vk6REmpV)>)UiHQkQBpQvr zP$8qGrR9J#Ad__)m{te*d_MGPkaLTCp8HNa#oSFBuI`v1`^p*`8bUuj0hJcT=|Ld8 XT}oTlA1=`WnIVq0E;hxh1ET*0MuzH- literal 0 HcmV?d00001 diff --git a/Theme/Chicago95/gtk-3.0/gtk-windowbuttons.css b/Theme/Chicago95/gtk-3.0/gtk-windowbuttons.css index 6ab6593..c50528a 100644 --- a/Theme/Chicago95/gtk-3.0/gtk-windowbuttons.css +++ b/Theme/Chicago95/gtk-3.0/gtk-windowbuttons.css @@ -29,7 +29,7 @@ button.titlebutton { .titlebutton.close, .titlebutton.maximize, .titlebutton.minimize { - color: transparent; + color: @bg_dark; border: none; box-shadow: none; padding: 0px; @@ -37,39 +37,41 @@ button.titlebutton { background-color: transparent; min-width: 18px; min-height: 18px; - -gtk-icon-shadow: none; } + background-image: url("buttons/window_button_normal.png"); + -gtk-icon-shadow: none; + -gtk-icon-style: requested; } .titlebutton.minimize { - background-image: url("buttons/minimize_normal.png"); } + background-image: url("buttons/window_button_normal.png"); } .titlebutton.minimize:backdrop { - background-image: url("buttons/minimize_normal.png"); } + background-image: url("buttons/window_button_normal.png"); } .titlebutton.minimize:checked, .titlebutton.minimize:active { - background-image: url("buttons/minimize_pressed.png"); } + background-image: url("buttons/window_button_pressed.png"); } .titlebutton.maximize { - background-image: url("buttons/maximize_normal.png"); } + background-image: url("buttons/window_button_normal.png"); } .titlebutton.maximize:backdrop { - background-image: url("buttons/maximize_normal.png"); } + background-image: url("buttons/window_button_normal.png"); } .titlebutton.maximize:checked, .titlebutton.maximize:active { - background-image: url("buttons/maximize_pressed.png"); } + background-image: url("buttons/window_button_pressed.png"); } .maximized .titlebutton.maximize { - background-image: url("buttons/restore_normal.png"); } + background-image: url("buttons/window_button_normal.png"); } .maximized .titlebutton.maximize:backdrop { - background-image: url("buttons/restore_normal.png"); } + background-image: url("buttons/window_button_normal.png"); } .maximized .titlebutton.maximize:checked, .maximized .titlebutton.maximize:active { - background-image: url("buttons/restore_pressed.png"); } + background-image: url("buttons/window_button_pressed.png"); } .titlebutton.close { - background-image: url("buttons/close_normal.png"); } + background-image: url("buttons/window_button_normal.png"); } .titlebutton.close:backdrop { - background-image: url("buttons/close_normal.png"); } + background-image: url("buttons/window_button_normal.png"); } .titlebutton.close:checked, .titlebutton.close:active { - background-image: url("buttons/close_pressed.png"); } + background-image: url("buttons/window_button_pressed.png"); } /* Groups these buttons together */ .titlebutton.minimize {