From ca76d0e2e55cb9a6b69a29c19225c22bb50c6f96 Mon Sep 17 00:00:00 2001 From: Horst3180 Date: Sun, 29 May 2016 19:22:18 +0200 Subject: use accent color for menu highlight (fix #135) --- common/gtk-2.0/assets-dark.svg | 266 ++++++++++++++++++-- common/gtk-2.0/assets-dark/menu-arrow-prelight.png | Bin 246 -> 186 bytes .../assets-dark/menu-checkbox-checked-selected.png | Bin 0 -> 330 bytes .../menu-checkbox-unchecked-selected.png | Bin 0 -> 227 bytes .../assets-dark/menu-radio-checked-selected.png | Bin 0 -> 359 bytes .../assets-dark/menu-radio-unchecked-selected.png | Bin 0 -> 346 bytes common/gtk-2.0/assets-dark/menuitem.png | Bin 176 -> 156 bytes common/gtk-2.0/assets.svg | 269 +++++++++++++++++++-- common/gtk-2.0/assets.txt | 4 + common/gtk-2.0/assets/menu-arrow-prelight.png | Bin 265 -> 186 bytes .../assets/menu-checkbox-checked-selected.png | Bin 0 -> 330 bytes .../assets/menu-checkbox-unchecked-selected.png | Bin 0 -> 227 bytes .../gtk-2.0/assets/menu-radio-checked-selected.png | Bin 0 -> 359 bytes .../assets/menu-radio-unchecked-selected.png | Bin 0 -> 346 bytes common/gtk-2.0/assets/menuitem.png | Bin 166 -> 156 bytes common/gtk-2.0/main.rc | 39 ++- common/gtk-2.0/panel.rc | 14 +- 17 files changed, 533 insertions(+), 59 deletions(-) create mode 100644 common/gtk-2.0/assets-dark/menu-checkbox-checked-selected.png create mode 100644 common/gtk-2.0/assets-dark/menu-checkbox-unchecked-selected.png create mode 100644 common/gtk-2.0/assets-dark/menu-radio-checked-selected.png create mode 100644 common/gtk-2.0/assets-dark/menu-radio-unchecked-selected.png create mode 100644 common/gtk-2.0/assets/menu-checkbox-checked-selected.png create mode 100644 common/gtk-2.0/assets/menu-checkbox-unchecked-selected.png create mode 100644 common/gtk-2.0/assets/menu-radio-checked-selected.png create mode 100644 common/gtk-2.0/assets/menu-radio-unchecked-selected.png (limited to 'common/gtk-2.0') diff --git a/common/gtk-2.0/assets-dark.svg b/common/gtk-2.0/assets-dark.svg index c0b0814..ee913d7 100644 --- a/common/gtk-2.0/assets-dark.svg +++ b/common/gtk-2.0/assets-dark.svg @@ -565,9 +565,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="7.9999996" - inkscape:cx="254.60434" - inkscape:cy="52.761079" + inkscape:zoom="11.313708" + inkscape:cx="243.54683" + inkscape:cy="369.23846" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" @@ -4184,19 +4184,19 @@ + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" /> - - + style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/gtk-2.0/assets-dark/menu-arrow-prelight.png b/common/gtk-2.0/assets-dark/menu-arrow-prelight.png index 2e21d88..04bff49 100644 Binary files a/common/gtk-2.0/assets-dark/menu-arrow-prelight.png and b/common/gtk-2.0/assets-dark/menu-arrow-prelight.png differ diff --git a/common/gtk-2.0/assets-dark/menu-checkbox-checked-selected.png b/common/gtk-2.0/assets-dark/menu-checkbox-checked-selected.png new file mode 100644 index 0000000..e32f07e Binary files /dev/null and b/common/gtk-2.0/assets-dark/menu-checkbox-checked-selected.png differ diff --git a/common/gtk-2.0/assets-dark/menu-checkbox-unchecked-selected.png b/common/gtk-2.0/assets-dark/menu-checkbox-unchecked-selected.png new file mode 100644 index 0000000..9066a4c Binary files /dev/null and b/common/gtk-2.0/assets-dark/menu-checkbox-unchecked-selected.png differ diff --git a/common/gtk-2.0/assets-dark/menu-radio-checked-selected.png b/common/gtk-2.0/assets-dark/menu-radio-checked-selected.png new file mode 100644 index 0000000..0fab00a Binary files /dev/null and b/common/gtk-2.0/assets-dark/menu-radio-checked-selected.png differ diff --git a/common/gtk-2.0/assets-dark/menu-radio-unchecked-selected.png b/common/gtk-2.0/assets-dark/menu-radio-unchecked-selected.png new file mode 100644 index 0000000..7b08eac Binary files /dev/null and b/common/gtk-2.0/assets-dark/menu-radio-unchecked-selected.png differ diff --git a/common/gtk-2.0/assets-dark/menuitem.png b/common/gtk-2.0/assets-dark/menuitem.png index 56ad7b0..ce6bd54 100644 Binary files a/common/gtk-2.0/assets-dark/menuitem.png and b/common/gtk-2.0/assets-dark/menuitem.png differ diff --git a/common/gtk-2.0/assets.svg b/common/gtk-2.0/assets.svg index f9adeb6..6d149fc 100644 --- a/common/gtk-2.0/assets.svg +++ b/common/gtk-2.0/assets.svg @@ -565,9 +565,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="4" - inkscape:cx="248.42235" - inkscape:cy="35.189651" + inkscape:zoom="7.9999999" + inkscape:cx="263.38272" + inkscape:cy="373.79667" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" @@ -4166,19 +4166,19 @@ + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" /> - - + style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/gtk-2.0/assets.txt b/common/gtk-2.0/assets.txt index e7fc513..08e3959 100644 --- a/common/gtk-2.0/assets.txt +++ b/common/gtk-2.0/assets.txt @@ -31,12 +31,16 @@ radio-checked-insensitive radio-unchecked radio-unchecked-insensitive menu-checkbox-checked +menu-checkbox-checked-selected menu-checkbox-checked-insensitive menu-checkbox-unchecked +menu-checkbox-unchecked-selected menu-checkbox-unchecked-insensitive menu-radio-checked +menu-radio-checked-selected menu-radio-checked-insensitive menu-radio-unchecked +menu-radio-unchecked-selected menu-radio-unchecked-insensitive entry-border-bg-solid entry-border-active-bg-solid diff --git a/common/gtk-2.0/assets/menu-arrow-prelight.png b/common/gtk-2.0/assets/menu-arrow-prelight.png index 1e95c5d..04bff49 100644 Binary files a/common/gtk-2.0/assets/menu-arrow-prelight.png and b/common/gtk-2.0/assets/menu-arrow-prelight.png differ diff --git a/common/gtk-2.0/assets/menu-checkbox-checked-selected.png b/common/gtk-2.0/assets/menu-checkbox-checked-selected.png new file mode 100644 index 0000000..e32f07e Binary files /dev/null and b/common/gtk-2.0/assets/menu-checkbox-checked-selected.png differ diff --git a/common/gtk-2.0/assets/menu-checkbox-unchecked-selected.png b/common/gtk-2.0/assets/menu-checkbox-unchecked-selected.png new file mode 100644 index 0000000..9066a4c Binary files /dev/null and b/common/gtk-2.0/assets/menu-checkbox-unchecked-selected.png differ diff --git a/common/gtk-2.0/assets/menu-radio-checked-selected.png b/common/gtk-2.0/assets/menu-radio-checked-selected.png new file mode 100644 index 0000000..0fab00a Binary files /dev/null and b/common/gtk-2.0/assets/menu-radio-checked-selected.png differ diff --git a/common/gtk-2.0/assets/menu-radio-unchecked-selected.png b/common/gtk-2.0/assets/menu-radio-unchecked-selected.png new file mode 100644 index 0000000..7b08eac Binary files /dev/null and b/common/gtk-2.0/assets/menu-radio-unchecked-selected.png differ diff --git a/common/gtk-2.0/assets/menuitem.png b/common/gtk-2.0/assets/menuitem.png index 6b9faf6..ce6bd54 100644 Binary files a/common/gtk-2.0/assets/menuitem.png and b/common/gtk-2.0/assets/menuitem.png differ diff --git a/common/gtk-2.0/main.rc b/common/gtk-2.0/main.rc index 2a70e92..18da44a 100644 --- a/common/gtk-2.0/main.rc +++ b/common/gtk-2.0/main.rc @@ -708,7 +708,7 @@ style "menu_framed_box" { style "menu_item" { xthickness = 2 - ythickness = 4 + ythickness = 5 # HACK: Gtk doesn't actually read this value # while rendering the menu items, but Libreoffice @@ -720,10 +720,11 @@ style "menu_item" # See https://bugs.freedesktop.org/show_bug.cgi?id=38038 bg[SELECTED] = @selected_fg_color - fg[NORMAL] = @fg_color - fg[SELECTED] = @fg_color + fg[NORMAL] = @fg_color + fg[SELECTED] = @selected_fg_color - text[PRELIGHT] = @fg_color + fg[PRELIGHT] = @selected_fg_color + text[PRELIGHT] = @selected_fg_color engine "pixmap" { @@ -735,6 +736,28 @@ style "menu_item" stretch = TRUE } + # Fix invisible scale trough on selected menuitems + + image { + function = BOX + detail = "trough-lower" + file = "assets/trough-horizontal.png" + border = { 8, 8, 0, 0 } + stretch = TRUE + orientation = HORIZONTAL + } + + image { + function = SLIDER + state = PRELIGHT + file = "assets/null.png" + border = { 0, 0, 0, 0 } + stretch = TRUE + overlay_file = "assets/slider.png" + overlay_stretch = FALSE + orientation = HORIZONTAL + } + # Check Buttons image { @@ -751,7 +774,7 @@ style "menu_item" recolorable = TRUE state = PRELIGHT shadow = OUT - overlay_file = "assets/menu-checkbox-unchecked.png" + overlay_file = "assets/menu-checkbox-unchecked-selected.png" overlay_stretch = FALSE } @@ -787,7 +810,7 @@ style "menu_item" recolorable = TRUE state = PRELIGHT shadow = IN - overlay_file = "assets/menu-checkbox-checked.png" + overlay_file = "assets/menu-checkbox-checked-selected.png" overlay_stretch = FALSE } @@ -823,7 +846,7 @@ style "menu_item" function = OPTION state = PRELIGHT shadow = OUT - overlay_file = "assets/menu-radio-unchecked.png" + overlay_file = "assets/menu-radio-unchecked-selected.png" overlay_stretch = FALSE } @@ -855,7 +878,7 @@ style "menu_item" function = OPTION state = PRELIGHT shadow = IN - overlay_file = "assets/menu-radio-checked.png" + overlay_file = "assets/menu-radio-checked-selected.png" overlay_stretch = FALSE } diff --git a/common/gtk-2.0/panel.rc b/common/gtk-2.0/panel.rc index b2c2352..5b3df75 100644 --- a/common/gtk-2.0/panel.rc +++ b/common/gtk-2.0/panel.rc @@ -4,8 +4,8 @@ style "theme-panel" { ythickness = 0 bg[NORMAL] = "#2B2E37" - bg[ACTIVE] = shade(1.45, "#2B2E37") - bg[PRELIGHT] = shade(0.9, @selected_bg_color) + bg[ACTIVE] = @selected_bg_color + bg[PRELIGHT] = "#3f4453" bg[SELECTED] = @selected_bg_color fg[NORMAL] = "#BAC3CF" @@ -93,13 +93,13 @@ style "workspace-switcher" = "theme-panel" { bg[SELECTED] = @selected_bg_color } -style "window-buttons" = "theme-panel" -{ +style "window-buttons" = "theme-panel" { + xthickness = 3 ythickness = 3 - bg[ACTIVE] = shade(0.75, @selected_bg_color) - bg[PRELIGHT] = shade(0.9, @selected_bg_color) + bg[ACTIVE] = @selected_bg_color + bg[PRELIGHT] = shade(1.1,@selected_bg_color) bg[SELECTED] = @selected_bg_color engine "murrine" { @@ -160,6 +160,7 @@ widget "*Xfce*Panel*" style "theme-panel" class "*Xfce*Panel*" style "theme-panel" widget "*WnckPager*" style "workspace-switcher" widget "*TopMenu*" style "theme-panel" +widget "*XfceTasklist*" style "window-buttons" # Fix gtk-entries in the panel widget "*bookmark*GtkEntry" style "panel-entry" # fixes smartbookmark-plugin @@ -173,4 +174,3 @@ widget "*PanelApplet*" style "theme-panel-text" # Override general panel-style with specific plugin-styles widget "*indicator-applet*" style "indicator" widget "*indicator-button*" style "indicator" -widget "*XfceTasklist*" style "window-buttons" -- cgit v1.2.3