gnome-themes r1429 - in trunk: . gtk-themes/ClearlooksClassic gtk-themes/Glider gtk-themes/Glossy gtk-themes/Inverted
- From: bberg svn gnome org
- To: svn-commits-list gnome org
- Subject: gnome-themes r1429 - in trunk: . gtk-themes/ClearlooksClassic gtk-themes/Glider gtk-themes/Glossy gtk-themes/Inverted
- Date: Sun, 2 Mar 2008 18:13:19 +0000 (GMT)
Author: bberg
Date: Sun Mar 2 18:13:18 2008
New Revision: 1429
URL: http://svn.gnome.org/viewvc/gnome-themes?rev=1429&view=rev
Log:
2008-03-02 Benjamin Berg <benjamin sipsolutions net>
* gtk-themes/ClearlooksClassic/gtkrc:
* gtk-themes/Glider/gtkrc:
* gtk-themes/Glossy/gtkrc:
* gtk-themes/Inverted/gtkrc:
Add work arounds for dark themes. This workarounds for
GtkCList/GtkCTree, GtkList and GtkComboBox and its popup menu.
Also fixed the event boxes in notebooks in Glossy.
Modified:
trunk/ChangeLog
trunk/gtk-themes/ClearlooksClassic/gtkrc
trunk/gtk-themes/Glider/gtkrc
trunk/gtk-themes/Glossy/gtkrc
trunk/gtk-themes/Inverted/gtkrc
Modified: trunk/gtk-themes/ClearlooksClassic/gtkrc
==============================================================================
--- trunk/gtk-themes/ClearlooksClassic/gtkrc (original)
+++ trunk/gtk-themes/ClearlooksClassic/gtkrc Sun Mar 2 18:13:18 2008
@@ -115,7 +115,6 @@
xthickness = 2
ythickness = 3
fg[PRELIGHT] = @selected_fg_color
- text[PRELIGHT] = @selected_fg_color
}
style "clearlooks-tree" = "clearlooks-default"
@@ -211,15 +210,83 @@
# Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646
# Note that the work around assumes that the combobox is _not_ in
# appears-as-list mode.
-# Similar hack also in the menuitem style.
# This style does not affect GtkComboBoxEntry, it does have an effect
# on comboboxes in appears-as-list mode though.
-style "clearlooks-combobox-text-color-workaround"
+style "clearlooks-text-is-fg-color-workaround"
{
- text[NORMAL] = @fg_color
- text[PRELIGHT] = @fg_color
- text[SELECTED] = @selected_fg_color
- text[ACTIVE] = @fg_color
- text[INSENSITIVE] = darker (@bg_color)
-}
-widget_class "*.<GtkComboBox>.<GtkCellView>" style "clearlooks-combobox-text-color-workaround"
+ text[NORMAL] = @fg_color
+ text[PRELIGHT] = @fg_color
+ text[SELECTED] = @selected_fg_color
+ text[ACTIVE] = @fg_color
+ text[INSENSITIVE] = darker (@bg_color)
+}
+widget_class "*.<GtkComboBox>.<GtkCellView>" style "clearlooks-text-is-fg-color-workaround"
+
+style "clearlooks-menuitem-text-is-fg-color-workaround"
+{
+ text[NORMAL] = @fg_color
+ text[PRELIGHT] = @selected_fg_color
+ text[SELECTED] = @selected_fg_color
+ text[ACTIVE] = @fg_color
+ text[INSENSITIVE] = darker (@bg_color)
+}
+widget "*.gtk-combobox-popup-menu.*" style "clearlooks-menuitem-text-is-fg-color-workaround"
+
+# Work around the usage of GtkLabel inside GtkListItems to display text.
+# This breaks because the label is shown on a background that is based on the
+# base color set.
+style "clearlooks-fg-is-text-color-workaround"
+{
+ fg[NORMAL] = @text_color
+ fg[PRELIGHT] = @text_color
+ fg[ACTIVE] = @selected_fg_color
+ fg[SELECTED] = @selected_fg_color
+ fg[INSENSITIVE] = darker (@bg_color)
+}
+widget_class "*<GtkListItem>*" style "clearlooks-fg-is-text-color-workaround"
+# The same problem also exists for GtkCList and GtkCTree
+# Only match GtkCList and not the parent widgets, because that would also change the headers.
+widget_class "*<GtkCList>" style "clearlooks-fg-is-text-color-workaround"
+
+# Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646
+# Note that the work around assumes that the combobox is _not_ in
+# appears-as-list mode.
+# This style does not affect GtkComboBoxEntry, it does have an effect
+# on comboboxes in appears-as-list mode though.
+style "clearlooks-text-is-fg-color-workaround"
+{
+ text[NORMAL] = @fg_color
+ text[PRELIGHT] = @fg_color
+ text[SELECTED] = @selected_fg_color
+ text[ACTIVE] = @fg_color
+ text[INSENSITIVE] = darker (@bg_color)
+}
+widget_class "*.<GtkComboBox>.<GtkCellView>" style "clearlooks-text-is-fg-color-workaround"
+
+style "clearlooks-menuitem-text-is-fg-color-workaround"
+{
+ text[NORMAL] = @fg_color
+ text[PRELIGHT] = @selected_fg_color
+ text[SELECTED] = @selected_fg_color
+ text[ACTIVE] = @fg_color
+ text[INSENSITIVE] = darker (@bg_color)
+}
+widget "*.gtk-combobox-popup-menu.*" style "clearlooks-menuitem-text-is-fg-color-workaround"
+
+# Work around the usage of GtkLabel inside GtkListItems to display text.
+# This breaks because the label is shown on a background that is based on the
+# base color set.
+style "clearlooks-fg-is-text-color-workaround"
+{
+ fg[NORMAL] = @text_color
+ fg[PRELIGHT] = @text_color
+ fg[ACTIVE] = @selected_fg_color
+ fg[SELECTED] = @selected_fg_color
+ fg[INSENSITIVE] = darker (@bg_color)
+}
+widget_class "*<GtkListItem>*" style "clearlooks-fg-is-text-color-workaround"
+# The same problem also exists for GtkCList and GtkCTree
+# Only match GtkCList and not the parent widgets, because that would also change the headers.
+widget_class "*<GtkCList>" style "clearlooks-fg-is-text-color-workaround"
+
+
Modified: trunk/gtk-themes/Glider/gtkrc
==============================================================================
--- trunk/gtk-themes/Glider/gtkrc (original)
+++ trunk/gtk-themes/Glider/gtkrc Sun Mar 2 18:13:18 2008
@@ -58,8 +58,6 @@
{
bg[PRELIGHT] = @selected_bg_color
fg[PRELIGHT] = @selected_fg_color
- base[PRELIGHT] = @selected_bg_color
- text[PRELIGHT] = @selected_fg_color
}
class "*MenuItem*" style "menuitem"
widget_class "*MenuItem*" style "menuitem"
@@ -127,3 +125,47 @@
GtkWidget::interior_focus = 1
}
widget "*Ephy*Location*" style "ephybug"
+
+
+# Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646
+# Note that the work around assumes that the combobox is _not_ in
+# appears-as-list mode.
+# This style does not affect GtkComboBoxEntry, it does have an effect
+# on comboboxes in appears-as-list mode though.
+style "glider-text-is-fg-color-workaround"
+{
+ text[NORMAL] = @fg_color
+ text[PRELIGHT] = @fg_color
+ text[SELECTED] = @selected_fg_color
+ text[ACTIVE] = @fg_color
+ text[INSENSITIVE] = darker (@bg_color)
+}
+widget_class "*.<GtkComboBox>.<GtkCellView>" style "glider-text-is-fg-color-workaround"
+
+style "glider-menuitem-text-is-fg-color-workaround"
+{
+ text[NORMAL] = @fg_color
+ text[PRELIGHT] = @selected_fg_color
+ text[SELECTED] = @selected_fg_color
+ text[ACTIVE] = @fg_color
+ text[INSENSITIVE] = darker (@bg_color)
+}
+widget "*.gtk-combobox-popup-menu.*" style "glider-menuitem-text-is-fg-color-workaround"
+
+# Work around the usage of GtkLabel inside GtkListItems to display text.
+# This breaks because the label is shown on a background that is based on the
+# base color set.
+style "glider-fg-is-text-color-workaround"
+{
+ fg[NORMAL] = @text_color
+ fg[PRELIGHT] = @text_color
+ fg[ACTIVE] = @selected_fg_color
+ fg[SELECTED] = @selected_fg_color
+ fg[INSENSITIVE] = darker (@bg_color)
+}
+widget_class "*<GtkListItem>*" style "glider-fg-is-text-color-workaround"
+# The same problem also exists for GtkCList and GtkCTree
+# Only match GtkCList and not the parent widgets, because that would also change the headers.
+widget_class "*<GtkCList>" style "glider-fg-is-text-color-workaround"
+
+
Modified: trunk/gtk-themes/Glossy/gtkrc
==============================================================================
--- trunk/gtk-themes/Glossy/gtkrc (original)
+++ trunk/gtk-themes/Glossy/gtkrc Sun Mar 2 18:13:18 2008
@@ -213,8 +213,55 @@
widget_class "*.GtkCList.GtkButton" style "clearlooks-tree"
widget_class "*.GtkFrame.GtkLabel" style "clearlooks-frame-title"
-# notebook stuff
-widget_class "*.GtkNotebook.*.GtkEventBox" style "clearlooks-notebook"
-widget_class "*.GtkNotebook.*.GtkViewport" style "clearlooks-notebook"
+# This is not perfect, it could be done better
+# (That is modify *every* widget in the notebook, and change those back that
+# we really don't want changed)
+widget_class "*<GtkNotebook>*<GtkEventBox>" style "clearlooks-notebook"
+widget_class "*<GtkNotebook>*<GtkDrawingArea>" style "clearlooks-notebook"
+widget_class "*<GtkNotebook>*<GtkLayout>" style "clearlooks-notebook"
class "GtkProgressBar" style "clearlooks-progressbar"
+
+
+# Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646
+# Note that the work around assumes that the combobox is _not_ in
+# appears-as-list mode.
+# This style does not affect GtkComboBoxEntry, it does have an effect
+# on comboboxes in appears-as-list mode though.
+style "clearlooks-text-is-fg-color-workaround"
+{
+ text[NORMAL] = @fg_color
+ text[PRELIGHT] = @fg_color
+ text[SELECTED] = @selected_fg_color
+ text[ACTIVE] = @fg_color
+ text[INSENSITIVE] = darker (@bg_color)
+}
+widget_class "*.<GtkComboBox>.<GtkCellView>" style "clearlooks-text-is-fg-color-workaround"
+
+style "clearlooks-menuitem-text-is-fg-color-workaround"
+{
+ text[NORMAL] = @fg_color
+ text[PRELIGHT] = @selected_fg_color
+ text[SELECTED] = @selected_fg_color
+ text[ACTIVE] = @fg_color
+ text[INSENSITIVE] = darker (@bg_color)
+}
+widget "*.gtk-combobox-popup-menu.*" style "clearlooks-menuitem-text-is-fg-color-workaround"
+
+# Work around the usage of GtkLabel inside GtkListItems to display text.
+# This breaks because the label is shown on a background that is based on the
+# base color set.
+style "clearlooks-fg-is-text-color-workaround"
+{
+ fg[NORMAL] = @text_color
+ fg[PRELIGHT] = @text_color
+ fg[ACTIVE] = @selected_fg_color
+ fg[SELECTED] = @selected_fg_color
+ fg[INSENSITIVE] = darker (@bg_color)
+}
+widget_class "*<GtkListItem>*" style "clearlooks-fg-is-text-color-workaround"
+# The same problem also exists for GtkCList and GtkCTree
+# Only match GtkCList and not the parent widgets, because that would also change the headers.
+widget_class "*<GtkCList>" style "clearlooks-fg-is-text-color-workaround"
+
+
Modified: trunk/gtk-themes/Inverted/gtkrc
==============================================================================
--- trunk/gtk-themes/Inverted/gtkrc (original)
+++ trunk/gtk-themes/Inverted/gtkrc Sun Mar 2 18:13:18 2008
@@ -115,7 +115,6 @@
xthickness = 2
ythickness = 3
fg[PRELIGHT] = @selected_fg_color
- text[PRELIGHT] = @selected_fg_color
}
style "clearlooks-tree" = "clearlooks-default"
@@ -190,9 +189,48 @@
widget_class "*.GtkCList.GtkButton" style "clearlooks-tree"
widget_class "*.GtkFrame.GtkLabel" style "clearlooks-frame-title"
-# notebook stuff
-widget_class "*.GtkNotebook.*.GtkEventBox" style "clearlooks-notebook"
-widget_class "*.GtkNotebook.*.GtkViewport" style "clearlooks-notebook"
-
class "GtkProgressBar" style "clearlooks-progressbar"
+
+# Work around for http://bugzilla.gnome.org/show_bug.cgi?id=382646
+# Note that the work around assumes that the combobox is _not_ in
+# appears-as-list mode.
+# This style does not affect GtkComboBoxEntry, it does have an effect
+# on comboboxes in appears-as-list mode though.
+style "clearlooks-text-is-fg-color-workaround"
+{
+ text[NORMAL] = @fg_color
+ text[PRELIGHT] = @fg_color
+ text[SELECTED] = @selected_fg_color
+ text[ACTIVE] = @fg_color
+ text[INSENSITIVE] = darker (@bg_color)
+}
+widget_class "*.<GtkComboBox>.<GtkCellView>" style "clearlooks-text-is-fg-color-workaround"
+
+style "clearlooks-menuitem-text-is-fg-color-workaround"
+{
+ text[NORMAL] = @fg_color
+ text[PRELIGHT] = @selected_fg_color
+ text[SELECTED] = @selected_fg_color
+ text[ACTIVE] = @fg_color
+ text[INSENSITIVE] = darker (@bg_color)
+}
+widget "*.gtk-combobox-popup-menu.*" style "clearlooks-menuitem-text-is-fg-color-workaround"
+
+# Work around the usage of GtkLabel inside GtkListItems to display text.
+# This breaks because the label is shown on a background that is based on the
+# base color set.
+style "clearlooks-fg-is-text-color-workaround"
+{
+ fg[NORMAL] = @text_color
+ fg[PRELIGHT] = @text_color
+ fg[ACTIVE] = @selected_fg_color
+ fg[SELECTED] = @selected_fg_color
+ fg[INSENSITIVE] = darker (@bg_color)
+}
+widget_class "*<GtkListItem>*" style "clearlooks-fg-is-text-color-workaround"
+# The same problem also exists for GtkCList and GtkCTree
+# Only match GtkCList and not the parent widgets, because that would also change the headers.
+widget_class "*<GtkCList>" style "clearlooks-fg-is-text-color-workaround"
+
+
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]