more tweaks to entry colors for #3512

git-svn-id: svn://localhost/ardour2/branches/3.0@10884 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/ardour3_styles.rc.in b/gtk2_ardour/ardour3_styles.rc.in
index 7ea58511d766c0c338172b97488735dd3e153cff..cb05d683134b2397b770bed51d00806475130a6d 100644 (file)
--- a/gtk2_ardour/ardour3_styles.rc.in
+++ b/gtk2_ardour/ardour3_styles.rc.in
@@ -40,7 +40,6 @@ style "default_generic" = "medium_text"
 
 style "text_cell_entry" = "medium_text"
 {
-       GtkWidget::cursor_color =  @@COLPREFIX@_darkest
 }
 
 style "very_small_button" = "default_button" 
@@ -730,18 +729,19 @@ style "track_name_display" = "medium_text"
 {
        fg[NORMAL] = @@COLPREFIX@_fg
        fg[ACTIVE] = @@COLPREFIX@_fg
+       fg[SELECTED] = @@COLPREFIX@_fg
+
+       text[NORMAL] = @@COLPREFIX@_fg
+       text[ACTIVE] = @@COLPREFIX@_fg
+       text[SELECTED] = @@COLPREFIX@_fg
 
        base[NORMAL] = @@COLPREFIX@_base
        base[ACTIVE] = lighter(@@COLPREFIX@_base)
+        base[SELECTED] = @@COLPREFIX@_bg_selected
+
        bg[NORMAL] = lighter(@@COLPREFIX@_base)
        bg[ACTIVE] = lighter(@@COLPREFIX@_base)
-}
-
-style "active_track_name_display" = "medium_text"
-{
-       GtkWidget::cursor_color =  @@COLPREFIX@_base
-       text[NORMAL] = @@COLPREFIX@_base
-       base[NORMAL] = @@COLPREFIX@_text
+       bg[SELECTED] = lighter(@@COLPREFIX@_base)
 }
 
 style "track_separator"

diff --git a/gtk2_ardour/ardour3_ui_dark.rc.in b/gtk2_ardour/ardour3_ui_dark.rc.in
index 1a083883c78aab1078a98850e0a64546162de23e..6af4fc196c3fda9111b5edb55608ac0b65a4da99 100644 (file)
--- a/gtk2_ardour/ardour3_ui_dark.rc.in
+++ b/gtk2_ardour/ardour3_ui_dark.rc.in
@@ -53,14 +53,10 @@ gtk_color_scheme = "@COLOR_SCHEME@"
 
 #alternate BG color: #5C5E61
 
-
 style "default" = "medium_text"
 {
   #Original values for reference
-  GtkWidget::cursor_color =  @@COLPREFIX@_lightest
-  GtkButton::default_border = { 0, 0, 0, 0 }
-  GtkButton::default_outside_border = { 0, 0, 0, 0 }
-  GtkButton::button_relief = GTK_RELIEF_NONE
+
   GtkTreeView::vertical-padding = 0
   GtkTreeView::horizontal-padding = 0
   GtkTreeView::even-row-color = shade(0.25,@@COLPREFIX@_base)
@@ -72,17 +68,18 @@ style "default" = "medium_text"
   GtkWidget           :: interior-focus                   = 1                 # [               1 ] ( bool ) Draw the focus indicator inside widgets.
   GtkWidget           :: scroll-arrow-hlength             = 16                # [              16 ] ( >= 1 ) Length of horizontal scroll arrows.
   GtkWidget           :: scroll-arrow-vlength             = 16                # [              16 ] ( >= 1 ) Length of vertical scroll arrows.
-
   GtkWidget           :: link-color                       = shade(1.25, @@COLPREFIX@_bright_color)
   GtkWidget           :: visited-link-color               = @@COLPREFIX@_bright_color
   
-#Window Properties
   GtkDialog           :: action-area-border               = 4                 # [               5 ] ( >= 0 ) Width of border around the button area at the bottom of the dialog.
   GtkDialog           :: button-spacing                   = 4                 # [               6 ] ( >= 0 ) Spacing between buttons.
   GtkDialog           :: content-area-border              = 2                 # [               2 ] ( >= 0 ) Width of border around the main dialog area.
   GtkDialog           :: content-area-spacing             = 0                 # [               0 ] ( >= 0 ) The default spacing used between elements of the content area of the dialog.
   
-#Control Properties
+
+  GtkButton           :: default-border = { 0, 0, 0, 0 }
+  GtkButton           :: default-outside_border = { 0, 0, 0, 0 }
+  GtkButton           :: button-relief = GTK_RELIEF_NONE
   GtkButton           :: child-displacement-x             = 1                 # [               0 ]          How far in x direction to move the button when its depressed.
   GtkButton           :: child-displacement-y             = 1                 # [               0 ]          ... y
   GtkButton           :: default-border                   = { 0, 0, 0, 0 }    #                              Extra space to add for CAN_DEFAULT buttons.
@@ -157,7 +154,7 @@ style "default" = "medium_text"
   GtkTreeView         :: vertical-separator               = 2                 # [               2 ] ( >= 0 ) Vertical space between cells. Must be an even number.
 
   GtkEntry            :: honors-transparent-bg-hint       = 1                 # [               0 ] ( bool ) (Clearlooks) Without this, gecko will fill in the background of the entry.
-
+  GtkEntry            :: cursor-color = @@COLPREFIX@_fg_selected
 
   #GtkToolbar::shadow_type = GTK_SHADOW_ETCHED_IN
 

diff --git a/gtk2_ardour/ardour3_widget_list.rc b/gtk2_ardour/ardour3_widget_list.rc
index a3c128ee1d4b21bc4f10051c3846e42a592de591..9ca5f0099fdf6c924df0a72e21ae5aacd6c7f3e1 100644 (file)
--- a/gtk2_ardour/ardour3_widget_list.rc
+++ b/gtk2_ardour/ardour3_widget_list.rc
@@ -191,8 +191,6 @@ widget "*TrackEditIndicator6*" style:highest "edit_group_3"
 widget "*TrackEditIndicator7*" style:highest "edit_group_3"
 widget "*EditorTrackNameDisplay" style:highest "track_name_display"
 widget "*EditorTrackNameDisplay*" style:highest "track_name_display"
-widget "*EditorActiveTrackNameDisplay" style:highest "active_track_name_display"
-widget "*EditorActiveTrackNameDisplay*" style:highest "active_track_name_display"
 widget "*CrossfadeEditAuditionButton" style:highest "bright_when_active"
 widget "*CrossfadeEditAuditionButton*" style:highest "bright_when_active"
 widget "*CrossfadeEditCurveButton" style:highest "bright_when_active"

diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc
index 8d2e94a13b5c32db140929b4675cc00e026ad5de..b2a9653b4c22b6e95ba2163a9a4198a0cee7f3fb 100644 (file)
--- a/gtk2_ardour/time_axis_view.cc
+++ b/gtk2_ardour/time_axis_view.cc
@@ -651,7 +651,7 @@ bool
 TimeAxisView::name_entry_focus_in (GdkEventFocus*)
 {
        name_entry.select_region (0, -1);
-       name_entry.set_name ("EditorActiveTrackNameDisplay");
+       name_entry.set_state (STATE_SELECTED);
        return false;
 }
 
@@ -662,8 +662,8 @@ TimeAxisView::name_entry_focus_out (GdkEventFocus*)
 
        last_name_entry_key_press_event = 0;
        name_entry_key_timeout.disconnect ();
-       name_entry.set_name ("EditorTrackNameDisplay");
        name_entry.select_region (0,0);
+       name_entry.set_state (STATE_NORMAL);
 
        /* do the real stuff */