diff options
Diffstat (limited to 'themes/Adwaita/gtk-2.0/main.rc')
| -rw-r--r-- | themes/Adwaita/gtk-2.0/main.rc | 230 |
1 files changed, 191 insertions, 39 deletions
diff --git a/themes/Adwaita/gtk-2.0/main.rc b/themes/Adwaita/gtk-2.0/main.rc index 1c49fb9d..092a6597 100644 --- a/themes/Adwaita/gtk-2.0/main.rc +++ b/themes/Adwaita/gtk-2.0/main.rc @@ -124,7 +124,7 @@ style "default" { base[NORMAL] = @base_color base[PRELIGHT] = shade (0.95, @bg_color) base[SELECTED] = @selected_bg_color - base[INSENSITIVE] = @bg_color + base[INSENSITIVE] = mix (0.5, @fg_color, @bg_color) base[ACTIVE] = @selected_bg_color # For succinctness, all reasonable pixmap options remain here @@ -1189,14 +1189,6 @@ style "default" { # Entries # ########### - image { - function = SHADOW - state = NORMAL - detail = "entry" - file = "assets/entry.png" - border = {4, 4, 4, 4} - stretch = TRUE - } image { function = SHADOW @@ -1217,10 +1209,11 @@ style "default" { } image { - function = FLAT_BOX - state = NORMAL - detail = "entry_bg" - file = "assets/entry-background.png" + function = SHADOW + detail = "entry" + file = "assets/entry.png" + border = {4, 4, 4, 4} + stretch = TRUE } image { @@ -1237,6 +1230,11 @@ style "default" { file = "assets/entry-background-insensitive.png" } + image { + function = FLAT_BOX + detail = "entry_bg" + file = "assets/entry-background.png" + } ######### # Spins # ######### @@ -1841,16 +1839,9 @@ style "entry" { # We set this same as the border of the border of the entry # This way there's no overlap - # TODO: find out what actually sets the size of the border xthickness = 4 ythickness = 4 - # The background of the entry cannot be drawn transparent - # This is going to be drawn on bg so we set it to bg - # This way it looks like one piece - base[NORMAL] = @bg_color - base[INSENSITIVE] = @bg_color - } style "combobox" { @@ -1871,7 +1862,7 @@ style "combobox_cellview" { style "combobox_entry" { # Since one side of the button is missing, we need to shift the arrow a little to the right - GtkButton::inner-border = {6, 8, 4, 4} + GtkButton::inner-border = {0, 1, 0, 0} engine "pixmap" { @@ -2031,16 +2022,16 @@ style "combobox_entry" { direction = RTL } - } } -style "combobox_button_padding" { +style "combo_button_padding" { # Since one side of the button is missing, we need to shift the arrow a little to the right - # This is the same thing we've done above but the combobox uses padding diffrerently than the combo - GtkButton::inner-border = {0, 1, 0, 0} + # This is the same thing we've done above but the combo, unlike the combobox, + # uses padding the same way as a button + GtkButton::inner-border = {6, 8, 4, 4} } @@ -2055,8 +2046,160 @@ style "notebook_viewport" { bg[NORMAL] = @base_color } -style "notebook_prelight" { - bg[PRELIGHT] = @base_color +style "notebook_bg" { + bg[NORMAL] = @base_color + bg[PRELIGHT] = @base_color + bg[INSENSITIVE] = @base_color +} + +style "notebook_entry" { + + engine "pixmap" { + + image { + function = SHADOW + state = ACTIVE + detail = "entry" + file = "assets/notebook-entry-active.png" + border = {4, 4, 4, 4} + stretch = TRUE + } + + image { + function = SHADOW + state = INSENSITIVE + detail = "entry" + file = "assets/notebook-entry-insensitive.png" + border = {4, 4, 4, 4} + stretch = TRUE + } + + image { + function = SHADOW + detail = "entry" + file = "assets/notebook-entry.png" + border = {4, 4, 4, 4} + stretch = TRUE + } + } +} + +style "normal_bg" { + bg[NORMAL] = @bg_color + bg[PRELIGHT] = @bg_color + bg[INSENSITIVE] = mix (0.6, @bg_color, @base_color) +} + +style "normal_entry" { + + engine "pixmap" { + + image { + function = SHADOW + state = ACTIVE + detail = "entry" + file = "assets/entry-active.png" + border = {4, 4, 4, 4} + stretch = TRUE + } + + image { + function = SHADOW + state = INSENSITIVE + detail = "entry" + file = "assets/entry-insensitive.png" + border = {4, 4, 4, 4} + stretch = TRUE + } + + image { + function = SHADOW + detail = "entry" + file = "assets/entry.png" + border = {4, 4, 4, 4} + stretch = TRUE + } + } +} + +style "notebook_combo" { + + engine "pixmap" { + + ############# + # LTR entry # + ############# + + image { + function = SHADOW + state = NORMAL + detail = "entry" + file = "assets/notebook-combo-entry-ltr-entry.png" + border = {4, 4, 4, 4} + stretch = TRUE + direction = LTR + } + + image { + function = SHADOW + state = ACTIVE + detail = "entry" + file = "assets/notebook-combo-entry-ltr-entry-active.png" + border = {4, 4, 4, 4} + stretch = TRUE + direction = LTR + } + + image { + function = SHADOW + state = INSENSITIVE + detail = "entry" + file = "assets/notebook-combo-entry-ltr-entry-insensitive.png" + border = {4, 4, 4, 4} + stretch = TRUE + direction = LTR + } + + ############# + # RTL entry # + ############# + + image { + function = SHADOW + state = NORMAL + detail = "entry" + file = "assets/notebook-combo-entry-rtl-entry.png" + border = {4, 4, 4, 4} + stretch = TRUE + direction = RTL + } + + image { + function = SHADOW + state = ACTIVE + detail = "entry" + file = "assets/notebook-combo-entry-rtl-entry-active.png" + border = {4, 4, 4, 4} + stretch = TRUE + direction = RTL + } + + image { + function = SHADOW + state = INSENSITIVE + detail = "entry" + file = "assets/notebook-combo-entry-rtl-entry-insensitive.png" + border = {4, 4, 4, 4} + stretch = TRUE + direction = RTL + } + + } + +} + +style "textview" { + bg[NORMAL] = @base_color } style "scale_horz" { @@ -2330,7 +2473,7 @@ style "disable_separator" { # Default style, containing most of the stuff class "GtkWidget" style "default" -# Override padding, style and colour +# Override padding, style and colour class "GtkButton" style "button" class "GtkLinkButton" style "link_button" class "GtkEntry" style "entry" @@ -2344,6 +2487,7 @@ class "GtkFrame" style "frame" class "GtkSeparatorToolItem" style "toolbar_separator" class "GtkMenuBar" style "menubar" class "GtkMenu" style "menu" +class "GtkTextView" style "textview" # Menu and menubar items widget_class "*<GtkMenuItem>*" style "menu_item" @@ -2361,10 +2505,6 @@ widget_class "*<GtkTreeView>*<GtkButton>*" style "treeview_header" # Give the file chooser toolbar a border widget_class "*<GtkFileChooserDefault>*<GtkToolbar>" style "inline_toolbar" -# TODO: find out why this is needed -# It only sets the bg color to base -widget_class "*<GtkNotebook>*<GtkScrolledWindow>*<GtkViewport>" style "notebook_viewport" - # Fix padding on regular comboboxes widget_class "*<GtkComboBox>.<GtkButton>" style "combobox" # And disable separators on them @@ -2372,11 +2512,11 @@ widget_class "*<GtkComboBox>.<GtkButton>*<GtkSeparator>" style "disable_separato # Join together the ComboBoxEntry entry and button widget_class "*<GtkComboBoxEntry>*" style "combobox_entry" -# Tweak the padding on the button a little bit because it uses it a bit differently -widget_class "*<GtkComboBoxEntry>.<GtkButton>" style "combobox_button_padding" # Join the Combo entry and button widget_class "*<GtkCombo>*" style "combobox_entry" +# Tweak the padding on the button a little bit because it uses it a bit differently +widget_class "*<GtkCombo>.<GtkButton>" style "combo_button_padding" # Alas we cannot do the same for ComboBoxText because there isn't a way to apply the style to only # the comboboxes that have an entry inside @@ -2384,11 +2524,23 @@ widget_class "*<GtkCombo>*" style "combobox_entry" # Toolbar buttons have different paddings widget_class "*<GtkToolbar>*<GtkButton>" style "toolbar_button" -# We need the prelight colour inside notebooks to be white so it won't change on hover -widget_class "*<GtkNotebook>*" style "notebook_prelight" - -#widget_class "*<GtkNotebook>*<GtkComboBoxEntry>*<GtkEntry>" style "notebook_combobox_entry" -widget_class "*<GtkNotebook>*<GtkEventBox>*<GtkComboBoxEntry>*<GtkEntry>" style "combobox_entry" +# Notebooks are white, act accordingly +widget_class "*<GtkNotebook>*<GtkEntry>" style "notebook_entry" +widget_class "*<GtkNotebook>*<GtkProgressBar>" style "notebook_bg" +widget_class "*<GtkNotebook>*<GtkSpinButton>" style "notebook_bg" +widget_class "*<GtkNotebook>*<GtkScrolledWindow>*<GtkViewport>" style "notebook_bg" +widget_class "*<GtkNotebook>*<GimpRuler>" style "notebook_bg" +widget_class "*<GtkNotebook>.<GimpDisplayShell>*<GtkEventBox>" style "notebook_bg" +widget_class "*<GtkNotebook>*<GtkComboBoxEntry>*" style "notebook_combo" +widget_class "*<GtkNotebook>*<GtkCombo>*" style "notebook_combo" + +# However, stuff inside eventboxes inside notebooks is grey again, react +widget_class "*<GtkNotebook>*<GtkEventBox>*<GtkEntry>" style "normal_entry" +widget_class "*<GtkNotebook>*<GtkEventBox>*<GtkProgressBar>" style "normal_bg" +widget_class "*<GtkNotebook>*<GtkEventBox>*<GtkSpinButton>" style "normal_bg" +widget_class "*<GtkNotebook>*<GtkEventBox>*<GtkComboBoxEntry>*" style "combobox_entry" +widget_class "*<GtkNotebook>*<GtkEventBox>*<GtkCombo>*" style "combobox_entry" +widget_class "*<GtkNotebook>*<GtkEventBox>*<GtkCombo>.<GtkButton>" style "combo_button_padding" # ComboBoxes tend to draw the button label with text[] instead of fg[], we need to fix that widget_class "*<GtkComboBox>*<GtkCellView>" style "combobox_cellview" |