From c4190bd8d00682a595770a3f96360753df8aab4e Mon Sep 17 00:00:00 2001 From: Doug McLain Date: Thu, 30 Mar 2006 10:40:58 +0000 Subject: [PATCH] rc changes to fix invisible checkboxes in export dialog for some themes. Fixed the cut off text in the track name button at the top of each mixer strip (the colored button). The theme engine style is still lost at the moment. I'm still working on that, and thats why the commented code additions. git-svn-id: svn://localhost/trunk/ardour2@428 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/ardour2_ui.rc | 9 +++++---- gtk2_ardour/mixer_strip.cc | 8 ++++++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/gtk2_ardour/ardour2_ui.rc b/gtk2_ardour/ardour2_ui.rc index dae246b74d..adb3c7e57f 100644 --- a/gtk2_ardour/ardour2_ui.rc +++ b/gtk2_ardour/ardour2_ui.rc @@ -141,8 +141,8 @@ style "default_buttons_menus" style "very_small_button" = "default_buttons_menus" { font_name = "sans 7" - xthickness = 0 ythickness = 0 + xthickness = 0 } style "small_button" = "default_buttons_menus" @@ -194,6 +194,7 @@ style "mixer_solo_button" = "solo_button" font_name = "sans 7" xthickness = 0 ythickness = 0 + } @@ -372,12 +373,12 @@ style "medium_entry" = "medium_text" base[NORMAL] = { 0, 0, 0 } base[ACTIVE] = { 0, 0, 0 } - base[SELECTED] = { 0, 0, 0 } + base[SELECTED] = { 0.5, 0.5, 1.0 } } style "medium_entry_noselection_fg" = "medium_entry" { - fg[SELECTED] = { 0.50, 1.0, 1.0 } + fg[SELECTED] = { 0.50, 1.0, 0.50 } } style "medium_entry_noselection_bg" = "medium_entry" @@ -851,7 +852,7 @@ widget "*ExportHeader" style "small_bold_text" widget "*ExportFileDisplay" style "medium_entry" widget "*ExportFormatDisplay" style "medium_entry" widget "*ExportCheckbox" style "small_entry" -widget "*ExportTrackSelector" style "medium_entry_noselection_bg" +widget "*ExportTrackSelector*" style "medium_entry_noselection_bg" widget "*EditModeSelector" style "medium_bold_entry" widget "*SnapTypeSelector" style "medium_bold_entry" widget "*SnapModeSelector" style "medium_bold_entry" diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index d69bfe43d3..f3aa7de0bb 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -1206,11 +1206,15 @@ MixerStrip::route_gui_changed (string what_changed, void* ignored) void MixerStrip::show_route_color () { - name_button.ensure_style (); + //name_button.ensure_style (); + int val = RC::get_style(group_button)->get_ythickness(); //grab the ythickness from any other button in the strip Glib::RefPtr style = name_button.get_style()->copy(); + //Glib::RefPtr style = RC::get_style(group_button)->copy(); style->set_bg (Gtk::STATE_NORMAL, color()); + style->set_ythickness(val); name_button.set_style (style); - + //name_button.get_style()->set_bg (Gtk::STATE_NORMAL, color()); + route_active_changed (); }