From a7674e24b352f34cec06dafbfb94f90f790dccdb Mon Sep 17 00:00:00 2001 From: Rafael Laguna Date: Sat, 12 Apr 2014 18:44:04 +0200 Subject: [PATCH] fix scrollbar --- .../gtk-2.0/apps/lubuntu_scrollbar.rc | 75 +++++++++ .../gtk-2.0/apps/old/notebook.rc | 151 ------------------ .../themes/Lubuntu-dark-panel/gtk-2.0/gtkrc | 1 + .../gtk-2.0/apps/lubuntu_scrollbar.rc | 75 +++++++++ .../gtk-2.0/apps/old/notebook.rc | 151 ------------------ .../themes/Lubuntu-default/gtk-2.0/gtkrc | 1 + 6 files changed, 152 insertions(+), 302 deletions(-) create mode 100644 usr/share/themes/Lubuntu-dark-panel/gtk-2.0/apps/lubuntu_scrollbar.rc delete mode 100644 usr/share/themes/Lubuntu-dark-panel/gtk-2.0/apps/old/notebook.rc create mode 100644 usr/share/themes/Lubuntu-default/gtk-2.0/apps/lubuntu_scrollbar.rc delete mode 100644 usr/share/themes/Lubuntu-default/gtk-2.0/apps/old/notebook.rc diff --git a/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/apps/lubuntu_scrollbar.rc b/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/apps/lubuntu_scrollbar.rc new file mode 100644 index 0000000..e09c262 --- /dev/null +++ b/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/apps/lubuntu_scrollbar.rc @@ -0,0 +1,75 @@ +style "default" { + + GtkScrollbar ::has-backward-stepper = 0 + GtkScrollbar ::has-forward-stepper = 1 + GtkScrollbar ::min-slider-length = 30 + GtkScrollbar ::slider-width = 9 + GtkScrollbar ::trough-border = 3 + GtkScrollbar ::activate-slider = FALSE + GtkScrollbar ::trough-side-details = 0 + GtkScrollbar ::stepper-size = 1 + + GtkScrolledWindow ::scrollbar-spacing = 0 + GtkScrolledWindow ::scrollbars-within-bevel = 1 + +} + +style "scrollbar" { + bg[SELECTED] = shade (0.70, @base_color) # color indicador + bg[NORMAL] = shade (0.90, @bg_color) # color borde indicador + + fg[NORMAL] = shade (1.00, @base_color) + fg[PRELIGHT] = shade (1.00, @base_color) + fg[ACTIVE] = shade (1.00, @base_color) + fg[SELECTED] = shade (1.00, @base_color) + fg[INSENSITIVE] = shade (1.00, @base_color) + + engine "murrine" { + roundness = 10 + gradient_shades = {1.0,1.0,1.0,1.0} + highlight_shade = 1.0 + glow_shade = 1.0 + #reliefstyle = 0 + prelight_shade = .75 + gradient_colors = FALSE + lightborder_shade = 1.0 + lightborderstyle = 0 + trough_shades = {1.05, 1.13} + border_shades = {1.32, 1.32} + contrast = 0.00 + colorize_scrollbar = TRUE + scrollbarstyle = 0 + } +} + +style "hscrollbar" { +} + +style "vscrollbar" { +} + +style "overlay_scrollbar" +{ + bg[SELECTED] = shade (1.0, @selected_bg_color) + bg[INSENSITIVE] = shade (0.85, @bg_color) + bg[ACTIVE] = shade (0.6, @bg_color) +} + +style "scale" = "button" { + bg[NORMAL] = @bg_color + bg[PRELIGHT] = shade (1.06, @bg_color) + bg[ACTIVE] = shade (0.94, @bg_color) + + engine "murrine" { + contrast = 0.6 + border_shades = {0.9, 0.8} + roundness = 5 + lightborder_shade = 1.32 + gradient_shades = {1.1, 1.0, 1.0, 0.8} + handlestyle = 2 + trough_border_shades = {0.9, 1.4} + glow_shade = 1.0 +# reliefstyle = 2 +# shadow_shades = { 1.0, 0.9 } + } +} diff --git a/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/apps/old/notebook.rc b/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/apps/old/notebook.rc deleted file mode 100644 index 6afdca0..0000000 --- a/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/apps/old/notebook.rc +++ /dev/null @@ -1,151 +0,0 @@ -######################################################################## -# Notebook -######################################################################## - -style "notebook_bg" { - bg[NORMAL] = "#e0e0e0" -} - -style "notebook" { - xthickness = 3 - ythickness = 3 - bg[NORMAL] = "#e0e0e0" - - engine "pixmap" { - -### Notebook ### - image { function = BOX - file = "images/notebook.png" - border = {4, 4, 4, 4} - stretch = TRUE } - -### Tab TOP ### - -## Normal - image { function = EXTENSION - state = ACTIVE - file = "images/notebook-tab-top.png" - border = {4, 4, 4, 4} - stretch = TRUE - gap_side = BOTTOM } - -## Active - image { function = EXTENSION - file = "images/notebook-tab-top-active.png" - border = {4, 4, 4, 4} - stretch = TRUE - gap_side = BOTTOM } - -### Tab BOTTOM ### - -## Normal - image { function = EXTENSION - state = ACTIVE - file = "images/notebook-tab-bottom.png" - border = {4, 4, 4, 4} - stretch = TRUE - gap_side = TOP } - -## Active - image { function = EXTENSION - file = "images/notebook-tab-bottom-active.png" - border = {4, 4, 4, 4} - stretch = TRUE - gap_side = TOP } - -### Tab LEFT ### - -## Normal - image { function = EXTENSION - state = ACTIVE - file = "images/notebook-tab-left.png" - border = {4,4,4,4} - stretch = TRUE - gap_side = RIGHT } - -## Active - image { function = EXTENSION - file = "images/notebook-tab-left-active.png" - border = {4, 4, 4, 4} - stretch = TRUE - gap_side = RIGHT } - -### Tab RIGHT ### - -## Normal - image { function = EXTENSION - state = ACTIVE - file = "images/notebook-tab-right.png" - border = {4, 4, 4, 4} - stretch = TRUE - gap_side = LEFT } - -## Active - image { function = EXTENSION - file = "images/notebook-tab-right-active.png" - border = {4, 4, 4, 4} - stretch = TRUE - gap_side = LEFT } - -### Gap TOP ### - image { function = BOX_GAP - file = "images/notebook.png" - border = {4, 4, 4, 4} - stretch = TRUE - gap_file = "images/notebook-top-gap.png" - gap_border = {4, 4, 0, 0} - gap_start_file = "images/null.png" - gap_start_border = {0, 0, 0, 0} - gap_end_file = "images/null.png" - gap_end_border = {0, 0, 0, 0} - gap_side = TOP } - -### Gap BOTTOM ### - image { function = BOX_GAP - file = "images/notebook.png" - border = {4, 4, 4, 4} - stretch = TRUE - gap_file = "images/notebook-bottom-gap.png" - gap_border = {4, 4, 0, 0} - gap_start_file = "images/null.png" - gap_start_border = {0, 0, 0, 0} - gap_end_file = "images/null.png" - gap_end_border = {0, 0, 0, 0} - gap_side = BOTTOM } - -### Gap LEFT ### - image { function = BOX_GAP - file = "images/notebook.png" - border = {4, 4, 4, 4} - stretch = TRUE - gap_file = "images/notebook-left-gap.png" - gap_border = {0, 0, 4, 4} - gap_start_file = "images/null.png" - gap_start_border = {0, 0, 0, 0} - gap_end_file = "images/null.png" - gap_end_border = {0, 0, 0, 0} - gap_side = LEFT } - -### Gap RIGHT ### - image { function = BOX_GAP - file = "images/notebook.png" - border = {4, 4, 4, 4} - stretch = TRUE - gap_file = "images/notebook-right-gap.png" - gap_border = {0, 0, 4, 4} - gap_start_file = "images/null.png" - gap_start_border = {0, 0, 0, 0} - gap_end_file = "images/null.png" - gap_end_border = {0, 0, 0, 0} - gap_side = RIGHT } - -### Focus ### - image { function = FOCUS - file = "images/null.png" - border = {1, 1, 1, 1} - stretch = TRUE } - } -} - -class "GtkNotebook*" style "notebook" - diff --git a/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/gtkrc b/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/gtkrc index 0cd941d..ef54da9 100644 --- a/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/gtkrc +++ b/usr/share/themes/Lubuntu-dark-panel/gtk-2.0/gtkrc @@ -677,6 +677,7 @@ include "apps/lubuntu_lxpanel.rc" include "apps/lubuntu_toolbar.rc" include "apps/lubuntu_entry.rc" include "apps/lubuntu_menu.rc" +include "apps/lubuntu_scrollbar.rc" include "apps/pcmanfm.rc" # XFCE specific diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/apps/lubuntu_scrollbar.rc b/usr/share/themes/Lubuntu-default/gtk-2.0/apps/lubuntu_scrollbar.rc new file mode 100644 index 0000000..e09c262 --- /dev/null +++ b/usr/share/themes/Lubuntu-default/gtk-2.0/apps/lubuntu_scrollbar.rc @@ -0,0 +1,75 @@ +style "default" { + + GtkScrollbar ::has-backward-stepper = 0 + GtkScrollbar ::has-forward-stepper = 1 + GtkScrollbar ::min-slider-length = 30 + GtkScrollbar ::slider-width = 9 + GtkScrollbar ::trough-border = 3 + GtkScrollbar ::activate-slider = FALSE + GtkScrollbar ::trough-side-details = 0 + GtkScrollbar ::stepper-size = 1 + + GtkScrolledWindow ::scrollbar-spacing = 0 + GtkScrolledWindow ::scrollbars-within-bevel = 1 + +} + +style "scrollbar" { + bg[SELECTED] = shade (0.70, @base_color) # color indicador + bg[NORMAL] = shade (0.90, @bg_color) # color borde indicador + + fg[NORMAL] = shade (1.00, @base_color) + fg[PRELIGHT] = shade (1.00, @base_color) + fg[ACTIVE] = shade (1.00, @base_color) + fg[SELECTED] = shade (1.00, @base_color) + fg[INSENSITIVE] = shade (1.00, @base_color) + + engine "murrine" { + roundness = 10 + gradient_shades = {1.0,1.0,1.0,1.0} + highlight_shade = 1.0 + glow_shade = 1.0 + #reliefstyle = 0 + prelight_shade = .75 + gradient_colors = FALSE + lightborder_shade = 1.0 + lightborderstyle = 0 + trough_shades = {1.05, 1.13} + border_shades = {1.32, 1.32} + contrast = 0.00 + colorize_scrollbar = TRUE + scrollbarstyle = 0 + } +} + +style "hscrollbar" { +} + +style "vscrollbar" { +} + +style "overlay_scrollbar" +{ + bg[SELECTED] = shade (1.0, @selected_bg_color) + bg[INSENSITIVE] = shade (0.85, @bg_color) + bg[ACTIVE] = shade (0.6, @bg_color) +} + +style "scale" = "button" { + bg[NORMAL] = @bg_color + bg[PRELIGHT] = shade (1.06, @bg_color) + bg[ACTIVE] = shade (0.94, @bg_color) + + engine "murrine" { + contrast = 0.6 + border_shades = {0.9, 0.8} + roundness = 5 + lightborder_shade = 1.32 + gradient_shades = {1.1, 1.0, 1.0, 0.8} + handlestyle = 2 + trough_border_shades = {0.9, 1.4} + glow_shade = 1.0 +# reliefstyle = 2 +# shadow_shades = { 1.0, 0.9 } + } +} diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/apps/old/notebook.rc b/usr/share/themes/Lubuntu-default/gtk-2.0/apps/old/notebook.rc deleted file mode 100644 index 6afdca0..0000000 --- a/usr/share/themes/Lubuntu-default/gtk-2.0/apps/old/notebook.rc +++ /dev/null @@ -1,151 +0,0 @@ -######################################################################## -# Notebook -######################################################################## - -style "notebook_bg" { - bg[NORMAL] = "#e0e0e0" -} - -style "notebook" { - xthickness = 3 - ythickness = 3 - bg[NORMAL] = "#e0e0e0" - - engine "pixmap" { - -### Notebook ### - image { function = BOX - file = "images/notebook.png" - border = {4, 4, 4, 4} - stretch = TRUE } - -### Tab TOP ### - -## Normal - image { function = EXTENSION - state = ACTIVE - file = "images/notebook-tab-top.png" - border = {4, 4, 4, 4} - stretch = TRUE - gap_side = BOTTOM } - -## Active - image { function = EXTENSION - file = "images/notebook-tab-top-active.png" - border = {4, 4, 4, 4} - stretch = TRUE - gap_side = BOTTOM } - -### Tab BOTTOM ### - -## Normal - image { function = EXTENSION - state = ACTIVE - file = "images/notebook-tab-bottom.png" - border = {4, 4, 4, 4} - stretch = TRUE - gap_side = TOP } - -## Active - image { function = EXTENSION - file = "images/notebook-tab-bottom-active.png" - border = {4, 4, 4, 4} - stretch = TRUE - gap_side = TOP } - -### Tab LEFT ### - -## Normal - image { function = EXTENSION - state = ACTIVE - file = "images/notebook-tab-left.png" - border = {4,4,4,4} - stretch = TRUE - gap_side = RIGHT } - -## Active - image { function = EXTENSION - file = "images/notebook-tab-left-active.png" - border = {4, 4, 4, 4} - stretch = TRUE - gap_side = RIGHT } - -### Tab RIGHT ### - -## Normal - image { function = EXTENSION - state = ACTIVE - file = "images/notebook-tab-right.png" - border = {4, 4, 4, 4} - stretch = TRUE - gap_side = LEFT } - -## Active - image { function = EXTENSION - file = "images/notebook-tab-right-active.png" - border = {4, 4, 4, 4} - stretch = TRUE - gap_side = LEFT } - -### Gap TOP ### - image { function = BOX_GAP - file = "images/notebook.png" - border = {4, 4, 4, 4} - stretch = TRUE - gap_file = "images/notebook-top-gap.png" - gap_border = {4, 4, 0, 0} - gap_start_file = "images/null.png" - gap_start_border = {0, 0, 0, 0} - gap_end_file = "images/null.png" - gap_end_border = {0, 0, 0, 0} - gap_side = TOP } - -### Gap BOTTOM ### - image { function = BOX_GAP - file = "images/notebook.png" - border = {4, 4, 4, 4} - stretch = TRUE - gap_file = "images/notebook-bottom-gap.png" - gap_border = {4, 4, 0, 0} - gap_start_file = "images/null.png" - gap_start_border = {0, 0, 0, 0} - gap_end_file = "images/null.png" - gap_end_border = {0, 0, 0, 0} - gap_side = BOTTOM } - -### Gap LEFT ### - image { function = BOX_GAP - file = "images/notebook.png" - border = {4, 4, 4, 4} - stretch = TRUE - gap_file = "images/notebook-left-gap.png" - gap_border = {0, 0, 4, 4} - gap_start_file = "images/null.png" - gap_start_border = {0, 0, 0, 0} - gap_end_file = "images/null.png" - gap_end_border = {0, 0, 0, 0} - gap_side = LEFT } - -### Gap RIGHT ### - image { function = BOX_GAP - file = "images/notebook.png" - border = {4, 4, 4, 4} - stretch = TRUE - gap_file = "images/notebook-right-gap.png" - gap_border = {0, 0, 4, 4} - gap_start_file = "images/null.png" - gap_start_border = {0, 0, 0, 0} - gap_end_file = "images/null.png" - gap_end_border = {0, 0, 0, 0} - gap_side = RIGHT } - -### Focus ### - image { function = FOCUS - file = "images/null.png" - border = {1, 1, 1, 1} - stretch = TRUE } - } -} - -class "GtkNotebook*" style "notebook" - diff --git a/usr/share/themes/Lubuntu-default/gtk-2.0/gtkrc b/usr/share/themes/Lubuntu-default/gtk-2.0/gtkrc index 0cd941d..ef54da9 100644 --- a/usr/share/themes/Lubuntu-default/gtk-2.0/gtkrc +++ b/usr/share/themes/Lubuntu-default/gtk-2.0/gtkrc @@ -677,6 +677,7 @@ include "apps/lubuntu_lxpanel.rc" include "apps/lubuntu_toolbar.rc" include "apps/lubuntu_entry.rc" include "apps/lubuntu_menu.rc" +include "apps/lubuntu_scrollbar.rc" include "apps/pcmanfm.rc" # XFCE specific