[longomatch] Fix appearance of checkbuttons in their different states and inside notebooks.



commit 37b7fc68b45b6ef587760637271ea141d6de5fdb
Author: Julien Moutte <julien fluendo com>
Date:   Tue Nov 25 19:48:01 2014 +0100

    Fix appearance of checkbuttons in their different states and inside notebooks.

 data/theme/gtk-2.0/checkbox.rc    |   11 +++++++++++
 data/theme/gtk-2.0/gtkrc          |    8 ++++----
 data/theme/gtk-2.0/radiobutton.rc |   12 ++++++++++--
 3 files changed, 25 insertions(+), 6 deletions(-)
---
diff --git a/data/theme/gtk-2.0/checkbox.rc b/data/theme/gtk-2.0/checkbox.rc
index f6f661f..34978c2 100644
--- a/data/theme/gtk-2.0/checkbox.rc
+++ b/data/theme/gtk-2.0/checkbox.rc
@@ -2,6 +2,9 @@
 
 style "longomatch-checkbox"
 {
+  # background color prelight
+  bg[PRELIGHT]   =  @active_color
+
   engine "pixmap"
   {
     image
@@ -94,5 +97,13 @@ style "longomatch-checkbox"
             overlay_file               = "Check-Radio/checkbox-checked-insensitive.png"
             overlay_stretch            = FALSE
        }
+  }
 }
+
+style "longomatch-checkbox-label"
+{
+  fg[NORMAL]     = @base_color
+  fg[ACTIVE]     = @text_color
+  fg[PRELIGHT]   = @bg_dark_color
 }
+
diff --git a/data/theme/gtk-2.0/gtkrc b/data/theme/gtk-2.0/gtkrc
index d4f6e42..a12966a 100644
--- a/data/theme/gtk-2.0/gtkrc
+++ b/data/theme/gtk-2.0/gtkrc
@@ -153,12 +153,16 @@ include "separator.rc"
 class "GtkWidget"                                style "longomatch-default"
 class "GtkEntry"                                 style "longomatch-entry"
 class "GtkButton"                                style "longomatch-square-button"
+class "GtkNotebook"                              style "longomatch-notebook"
+widget_class "*<GtkNotebook>*<GtkLabel>"         style "longomatch-notebook-tab-label"
 class "GtkPaned"                                 style "longomatch-handles"
 #Remove borders completely
 class "GtkAspectFrame"                           style "longomatch-aspect-frame"
 class "GtkCheckButton"                           style "longomatch-checkbox"
+widget_class "*<GtkCheckButton>.<GtkLabel>"      style "longomatch-checkbox-label"
 class "GtkCheckMenuItem"                         style "longomatch-checkbox"
 class "GtkRadioButton"                           style "longomatch-radiobutton"
+widget_class "*<GtkRadioButton>.<GtkLabel>"      style "longomatch-radiobutton-label"
 class "GtkTreeView"                              style "longomatch-treeview"
 class "GtkIconView"                              style "longomatch-treeview"
 class "GtkTextView"                              style "longomatch-treeview"
@@ -168,7 +172,6 @@ class "GtkHScale"                                style "longomatch-hscale"
 class "GtkVScale"                                style "longomatch-vscale"
 class "GtkScrollbar"                             style "longomatch-scrollbar"
 class "GtkSeparator"                             style "longomatch-separator"
-
 # Background for the menubar
 class "GtkMenuBar"                               style "longomatch-menubar"
 # Text color for the menu items in the bar and the menus
@@ -184,9 +187,6 @@ widget_class "*AwayTeamsComboBox*"               style "longomatch-away-teams-co
 widget_class "*<GtkComboBox>.*"                  style "longomatch-combobox-children"
 widget_class "*TeamsComboBox*.*"                 style "longomatch-teams-combobox-children"
 
-class "GtkNotebook"                              style "longomatch-notebook"
-widget_class "*<GtkNotebook>*<GtkLabel>"         style "longomatch-notebook-tab-label"
-
 widget "*entryeventbox"                          style "longomatch-custom-entry"
 widget "*entryeventbox.*"                        style "longomatch-custom-entry-children"
 
diff --git a/data/theme/gtk-2.0/radiobutton.rc b/data/theme/gtk-2.0/radiobutton.rc
index f98ac2f..18d44d0 100644
--- a/data/theme/gtk-2.0/radiobutton.rc
+++ b/data/theme/gtk-2.0/radiobutton.rc
@@ -2,6 +2,9 @@
 
 style "longomatch-radiobutton"
 {
+  # background color prelight
+  bg[PRELIGHT]   =  @active_color
+
   engine "pixmap"
   {
        image 
@@ -84,7 +87,12 @@ style "longomatch-radiobutton"
             overlay_file               = "Check-Radio/option-checked-insensitive.png"
             overlay_stretch            = FALSE
         }
+  }
 }
-}
-
 
+style "longomatch-radiobutton-label"
+{
+  fg[NORMAL]     = @base_color
+  fg[ACTIVE]     = @text_color
+  fg[PRELIGHT]   = @bg_dark_color
+}


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]