diff --git a/src/gtk2/widgets/default b/src/gtk2/widgets/default index d714d83..908c8d0 100644 --- a/src/gtk2/widgets/default +++ b/src/gtk2/widgets/default @@ -1,542 +1,542 @@ gtk-auto-mnemonics = 1 style "default" { xthickness = 1 ythickness = 1 # Style Properties GtkScrollbar::activate-slider = 1 GtkWidget::focus-line-width = 0 GtkWidget::new-tooltip-style = 1 GtkWidget::tooltip-alpha = 230 GtkWidget::tooltip-radius = 2 GtkMenuBar::window-dragging = 1 GtkToolbar::window-dragging = 1 GtkToolbar::internal-padding = 5 GtkToolButton::icon-spacing = 4 GtkSeparatorMenuItem::horizontal-padding = 3 GtkSeparatorMenuItem::wide-separators = 1 GtkSeparatorMenuItem::separator-height = 1 GtkCheckMenuItem::indicator-size = 18 GtkRadioMenuItem::indicator-size = 18 GtkButton::child-displacement-y = 0 GtkButton::default-border = { 0, 0, 0, 0 } GtkButton::default-outside_border = { 0, 0, 0, 0 } GtkScrollbar::trough-border = 0 GtkScrollbar::slider-width = 20 GtkRange::trough-border = 0 GtkRange::slider-width = 7 GtkRange::stepper-size = 0 GtkScrollbar::has-backward-stepper = 1 GtkScrollbar::has-forward-stepper = 1 - GtkScrollbar::stepper-size = 15 + GtkScrollbar::stepper-size = 7 GtkScrollbar::stepper-spacing = 0 GtkScrolledWindow ::scrollbar-spacing = 0 GtkScrolledWindow ::scrollbars-within-bevel = 1 GtkVScale::slider_length = 20 GtkVScale::slider_width = 20 GtkHScale::slider_length = 20 GtkHScale::slider_width = 20 GtkStatusbar::shadow_type = GTK_SHADOW_NONE GtkSpinButton::shadow_type = GTK_SHADOW_NONE GtkMenuBar::shadow-type = GTK_SHADOW_NONE GtkMenuBar::internal-padding = 3 GtkMenu::horizontal-padding = 0 GtkMenu::vertical-padding = 0 GtkNotebook::tab-overlap = 1 GtkNotebook::tab-curvature = 3 GtkCheckButton::indicator_spacing = 3 #GtkOptionMenu::indicator_spacing = { 0, 0, 0, 0 } GtkTreeView::row_ending_details = 0 GtkTreeView::expander-size = 12 GtkTreeView::vertical-separator = 1 GtkTreeView::horizontal-separator = 4 GtkTreeView::allow-rules = 1 GtkProgressBar::min-horizontal-bar-height = 8 GtkProgressBar::min-vertical-bar-width = 8 GtkEntry::state-hint = 1 # Colors bg[NORMAL] = @bg_color bg[PRELIGHT] = @bg_color bg[SELECTED] = @selected_bg_color bg[INSENSITIVE] = @bg_color bg[ACTIVE] = @bg_color fg[NORMAL] = @fg_color fg[PRELIGHT] = @fg_color fg[SELECTED] = @selected_fg_color fg[INSENSITIVE] = @insensitive_fg_color fg[ACTIVE] = @fg_color text[NORMAL] = @text_color text[PRELIGHT] = @text_color text[SELECTED] = @selected_fg_color text[INSENSITIVE] = @insensitive_text_color text[ACTIVE] = @selected_fg_color base[NORMAL] = @base_color base[PRELIGHT] = @base_color base[SELECTED] = @selected_bg_color base[INSENSITIVE] = @bg_color base[ACTIVE] = @selected_bg_color # All pixmap options are consolidated below this point engine "pixmap" { # Check Buttons image { function = CHECK recolorable = TRUE state = NORMAL shadow = OUT overlay_file = "../assets/check-unchecked.png" overlay_stretch = FALSE } image { function = CHECK recolorable = TRUE state = PRELIGHT shadow = OUT overlay_file = "../assets/check-unchecked-hover.png" overlay_stretch = FALSE } image { function = CHECK recolorable = TRUE state = ACTIVE shadow = OUT overlay_file = "../assets/check-unchecked-active.png" overlay_stretch = FALSE } image { function = CHECK recolorable = TRUE state = SELECTED shadow = OUT overlay_file = "../assets/check-unchecked.png" overlay_stretch = FALSE } image { function = CHECK recolorable = TRUE state = INSENSITIVE shadow = OUT overlay_file = "../assets/check-unchecked-insensitive.png" overlay_stretch = FALSE } image { function = CHECK recolorable = TRUE state = NORMAL shadow = IN overlay_file = "../assets/check-checked-active.png" overlay_stretch = FALSE } image { function = CHECK recolorable = TRUE state = PRELIGHT shadow = IN overlay_file = "../assets/check-checked-hover.png" overlay_stretch = FALSE } image { function = CHECK recolorable = TRUE state = ACTIVE shadow = IN overlay_file = "../assets/check-checked-active.png" overlay_stretch = FALSE } image { function = CHECK recolorable = TRUE state = SELECTED shadow = IN overlay_file = "../assets/check-checked-active.png" overlay_stretch = FALSE } image { function = CHECK recolorable = TRUE state = INSENSITIVE shadow = IN overlay_file = "../assets/check-checked-insensitive.png" overlay_stretch = FALSE } # Radio Buttons image { function = OPTION state = NORMAL shadow = OUT overlay_file = "../assets/radio-unchecked.png" overlay_stretch = FALSE } image { function = OPTION state = PRELIGHT shadow = OUT overlay_file = "../assets/radio-unchecked-hover.png" overlay_stretch = FALSE } image { function = OPTION state = ACTIVE shadow = OUT overlay_file = "../assets/radio-unchecked-active.png" overlay_stretch = FALSE } image { function = OPTION state = SELECTED shadow = OUT overlay_file = "../assets/radio-unchecked.png" overlay_stretch = FALSE } image { function = OPTION state = INSENSITIVE shadow = OUT overlay_file = "../assets/radio-unchecked-insensitive.png" overlay_stretch = FALSE } image { function = OPTION state = NORMAL shadow = IN overlay_file = "../assets/radio-checked-active.png" overlay_stretch = FALSE } image { function = OPTION state = PRELIGHT shadow = IN overlay_file = "../assets/radio-checked-hover.png" overlay_stretch = FALSE } image { function = OPTION state = ACTIVE shadow = IN overlay_file = "../assets/radio-checked-active.png" overlay_stretch = FALSE } image { function = OPTION state = SELECTED shadow = IN overlay_file = "../assets/radio-checked-active.png" overlay_stretch = FALSE } image { function = OPTION state = INSENSITIVE shadow = IN overlay_file = "../assets/radio-checked-insensitive.png" overlay_stretch = FALSE } # Arrows image { function = ARROW state = NORMAL overlay_file = "../assets/arrow-up.png" overlay_border = { 0, 0, 0, 0 } overlay_stretch = FALSE arrow_direction = UP } image { function = ARROW state = PRELIGHT overlay_file = "../assets/arrow-up-hover.png" overlay_border = { 0, 0, 0, 0 } overlay_stretch = FALSE arrow_direction = UP } image { function = ARROW state = ACTIVE overlay_file = "../assets/arrow-up-active.png" overlay_border = { 0, 0, 0, 0 } overlay_stretch = FALSE arrow_direction = UP } image { function = ARROW state = INSENSITIVE overlay_file = "../assets/arrow-up-insensitive.png" overlay_border = { 0, 0, 0, 0 } overlay_stretch = FALSE arrow_direction = UP } image { function = ARROW state = NORMAL overlay_file = "../assets/arrow-down.png" overlay_border = { 0, 0, 0, 0 } overlay_stretch = FALSE arrow_direction = DOWN } image { function = ARROW state = PRELIGHT overlay_file = "../assets/arrow-down-hover.png" overlay_border = { 0, 0, 0, 0 } overlay_stretch = FALSE arrow_direction = DOWN } image { function = ARROW state = ACTIVE overlay_file = "../assets/arrow-down-active.png" overlay_border = { 0, 0, 0, 0 } overlay_stretch = FALSE arrow_direction = DOWN } image { function = ARROW state = INSENSITIVE overlay_file = "../assets/arrow-down-insensitive.png" overlay_border = { 0, 0, 0, 0 } overlay_stretch = FALSE arrow_direction = DOWN } image { function = ARROW state = NORMAL overlay_file = "../assets/arrow-left.png" overlay_border = { 0, 0, 0, 0 } overlay_stretch = FALSE arrow_direction = LEFT } image { function = ARROW state = PRELIGHT overlay_file = "../assets/arrow-left-hover.png" overlay_border = { 0, 0, 0, 0 } overlay_stretch = FALSE arrow_direction = LEFT } image { function = ARROW state = ACTIVE overlay_file = "../assets/arrow-left-active.png" overlay_border = { 0, 0, 0, 0 } overlay_stretch = FALSE arrow_direction = LEFT } image { function = ARROW state = INSENSITIVE overlay_file = "../assets/arrow-left-insensitive.png" overlay_border = { 0, 0, 0, 0 } overlay_stretch = FALSE arrow_direction = LEFT } image { function = ARROW state = NORMAL overlay_file = "../assets/arrow-right.png" overlay_border = { 0, 0, 0, 0 } overlay_stretch = FALSE arrow_direction = RIGHT } image { function = ARROW state = PRELIGHT overlay_file = "../assets/arrow-right-hover.png" overlay_border = { 0, 0, 0, 0 } overlay_stretch = FALSE arrow_direction = RIGHT } image { function = ARROW state = ACTIVE overlay_file = "../assets/arrow-right-active.png" overlay_border = { 0, 0, 0, 0 } overlay_stretch = FALSE arrow_direction = RIGHT } image { function = ARROW state = INSENSITIVE overlay_file = "../assets/arrow-right-insensitive.png" overlay_border = { 0, 0, 0, 0 } overlay_stretch = FALSE arrow_direction = RIGHT } # Option Menu ../assets image { function = TAB state = INSENSITIVE overlay_file = "../assets/arrow-down-insensitive.png" overlay_stretch = FALSE } image { function = TAB state = NORMAL overlay_file = "../assets/arrow-down.png" overlay_border = { 0, 0, 0, 0 } overlay_stretch = FALSE } image { function = TAB state = PRELIGHT overlay_file = "../assets/arrow-down.png" overlay_border = { 0, 0, 0, 0 } overlay_stretch = FALSE } #Lines image { function = VLINE file = "../assets/handle-v.png" border = { 0, 0, 0, 0 } stretch = TRUE } image { function = HLINE file = "../assets/line-h.png" border = { 0, 0, 0, 0 } stretch = TRUE } # Handles image { function = HANDLE overlay_file = "../assets/handle-h.png" overlay_stretch = FALSE orientation = HORIZONTAL } image { function = HANDLE overlay_file = "../assets/handle-v.png" overlay_stretch = FALSE orientation = VERTICAL } # Expanders image { function = EXPANDER expander_style = COLLAPSED file = "../assets/arrow-right.png" } image { function = EXPANDER expander_style = EXPANDED file = "../assets/arrow-down.png" } image { function = EXPANDER expander_style = SEMI_EXPANDED file = "../assets/arrow-down.png" } image { function = EXPANDER expander_style = SEMI_COLLAPSED file = "../assets/arrow-right.png" } image { function = RESIZE_GRIP state = NORMAL detail = "statusbar" overlay_file = "../assets/null.png" overlay_border = { 0,0,0,0 } overlay_stretch = FALSE } # Shadows ( this area needs help :P ) image { function = SHADOW_GAP file = "../assets/null.png" border = { 4, 4, 4, 4 } stretch = TRUE } } } diff --git a/src/gtk2/widgets/scrollbar b/src/gtk2/widgets/scrollbar index 903e447..96aae92 100644 --- a/src/gtk2/widgets/scrollbar +++ b/src/gtk2/widgets/scrollbar @@ -1,110 +1,117 @@ style "scrollbar" { engine "pixmap" { - image + image { function = BOX detail = "trough" file = "../assets/scrollbar-trough-horizontal.png" - border = { 25,25, 5, 5 } #large borders while LibreOffice won't use GtkScrollbar::stepper-spacing=1 + border = { 25,25, 7, 7 } #large borders while LibreOffice won't use GtkScrollbar::stepper-spacing=1 stretch = TRUE orientation = HORIZONTAL } image { function = BOX detail = "trough" file = "../assets/scrollbar-trough-vertical.png" - border = { 5, 5, 25, 25 } + border = { 7, 7, 25, 25 } stretch = TRUE orientation = VERTICAL } - + # Sliders image { function = SLIDER state = NORMAL file = "../assets/scrollbar-slider-horizontal.png" border = { 5, 5, 5, 5 } stretch = TRUE orientation = HORIZONTAL } image { function = SLIDER state = ACTIVE - file = "../assets/scrollbar-slider-horizontal-active.png" + file = "../assets/scrollbar-slider-horizontal-hover.png" border = { 5, 5, 5, 5 } stretch = TRUE orientation = HORIZONTAL } image { function = SLIDER state = PRELIGHT file = "../assets/scrollbar-slider-horizontal-hover.png" border = { 5, 5, 5, 5 } stretch = TRUE orientation = HORIZONTAL } image { function = SLIDER state = INSENSITIVE file = "../assets/scrollbar-slider-horizontal.png" border = { 5, 5, 5, 5 } stretch = TRUE orientation = HORIZONTAL } # X Verticals image { function = SLIDER state = NORMAL file = "../assets/scrollbar-slider-vertical.png" border = { 5, 5, 5, 5 } stretch = TRUE orientation = VERTICAL - + } image { function = SLIDER state = ACTIVE - file = "../assets/scrollbar-slider-vertical-active.png" + file = "../assets/scrollbar-slider-vertical-hover.png" border = { 5, 5, 5, 5 } stretch = TRUE orientation = VERTICAL } image { function = SLIDER state = PRELIGHT file = "../assets/scrollbar-slider-vertical-hover.png" border = { 5, 5, 5, 5 } stretch = TRUE orientation = VERTICAL } image { function = SLIDER state = INSENSITIVE file = "../assets/scrollbar-slider-vertical.png" border = { 5, 5, 5, 5 } stretch = TRUE orientation = VERTICAL } + image + { + function = STEPPER + file = "../assets/null.png" + stretch = TRUE + + } } } diff --git a/src/gtk2/widgets/styles b/src/gtk2/widgets/styles index c800b66..01a0da8 100644 --- a/src/gtk2/widgets/styles +++ b/src/gtk2/widgets/styles @@ -1,52 +1,52 @@ class "GtkWidget" style "default" class "GtkScrollbar" style "scrollbar" class "GtkButton" style "button" class "GtkEntry" style "entry" class "GtkOldEditable" style "entry" class "GtkSpinButton" style "spinbutton" class "GtkNotebook" style "notebook" class "GtkRange" style "range" class "GtkProgressBar" style "progressbar" class "GtkSeparatorMenuItem" style "separator_menu_item" class "GtkScrolledWindow" style "scrolled_window" class "GtkFrame" style "frame" class "GtkToolButton" style "toolbuttons" class "ChromeGtkFrame" style "chrome-gtk-frame" class "GtkToggleButton" style "togglebutton" widget_class "**" style "menubar" widget_class "**" style "menu" widget_class "**" style "menu_framed_box" widget_class "**" style "menu_item" widget_class "*.*" style "menubar_item" widget_class "*Nautilus*ToolBar*" style "toolbar" widget_class "*HandleBox" style "toolbar" widget_class "*BonoboDockItem" style "toolbar" widget_class "*HandleBox" style "toolbar" widget_class "*" style "toolbar" widget_class "*.*" style "treeview" widget_class "*Tool*GtkButton" style "toolbuttons" widget_class "*Tool*GtkToggleButton" style "tooltoggle_buttons" widget_class "**" style "tooltoggle_buttons" widget_class "**" style "button_label" widget_class "*.." style "button_label" widget_class "**" style "button" widget_class "**" style "combobox_separator" widget_class "*.*" style "combobox_separator" widget_class "**" style "combobox_entry" widget_class "**" style "combobox_entry_button" widget_class "**" style "combobox_entry" widget_class "*." style "combobox_entry_button" widget_class "**GtkToggleButton*" style "toolbuttons" widget_class "**GtkComboBox*" style "button" widget_class "*." style "notebook_tab_label" widget "gtk-tooltip*" style "tooltips" # Xchat special cases widget "*xchat-inputbox" style "entry" # Chrome/Chromium widget_class "*Chrom*Button*" style "button" -widget "*swt*toolbar*" style "null" +widget "*swt*toolbar*" style "toolbuttons" class "GtkWindow" style "toplevel_hack"