diff options
| author | Karsten Wiese <fzuuzf@googlemail.com> | 2005-12-18 12:02:42 +0000 |
|---|---|---|
| committer | Karsten Wiese <fzuuzf@googlemail.com> | 2005-12-18 12:02:42 +0000 |
| commit | 46627353ad00e2a462b1fff4c8074218bd7346aa (patch) | |
| tree | 4df43a1b9cee29b8190993576f8ed918f8c80001 | |
| parent | d2b8a7f6bdcb66960c387449cfb2877bd896ceeb (diff) | |
track-color chooser works
git-svn-id: svn://localhost/trunk/ardour2@196 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | gtk2_ardour/route_ui.cc | 9 | ||||
| -rw-r--r-- | gtk2_ardour/route_ui.h | 2 | ||||
| -rw-r--r-- | libs/gtkmm2ext/gtk_ui.cc | 2 | ||||
| -rw-r--r-- | libs/gtkmm2ext/gtkmm2ext/gtk_ui.h | 2 |
4 files changed, 5 insertions, 10 deletions
diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index 8aa960147e..90aaec7eef 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -564,13 +564,8 @@ RouteUI::choose_color() { bool picked; Gdk::Color color; - Gdk::Color current; - current.set_red ( _color.get_red() / 65535); - current.set_green (_color.get_green() / 65535); - current.set_blue (_color.get_blue() / 65535); - - color = Gtkmm2ext::UI::instance()->get_color (_("ardour: color selection"), picked, ¤t); + color = Gtkmm2ext::UI::instance()->get_color (_("ardour: color selection"), picked, &_color); if (picked) { set_color (color); @@ -580,7 +575,7 @@ RouteUI::choose_color() } void -RouteUI::set_color (Gdk::Color c) +RouteUI::set_color (const Gdk::Color & c) { char buf[64]; diff --git a/gtk2_ardour/route_ui.h b/gtk2_ardour/route_ui.h index 20dd4f6b36..786523167d 100644 --- a/gtk2_ardour/route_ui.h +++ b/gtk2_ardour/route_ui.h @@ -59,7 +59,7 @@ class RouteUI : public virtual AxisView ARDOUR::Route& _route; - void set_color (Gdk::Color c); + void set_color (const Gdk::Color & c); bool choose_color (); bool ignore_toggle; diff --git a/libs/gtkmm2ext/gtk_ui.cc b/libs/gtkmm2ext/gtk_ui.cc index 10ca908773..722b6a15ef 100644 --- a/libs/gtkmm2ext/gtk_ui.cc +++ b/libs/gtkmm2ext/gtk_ui.cc @@ -815,7 +815,7 @@ UI::just_hide_it (GdkEventAny *ev, Window *win) } Gdk::Color -UI::get_color (const string& prompt, bool& picked, Gdk::Color* initial) +UI::get_color (const string& prompt, bool& picked, const Gdk::Color* initial) { Gdk::Color color; diff --git a/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h b/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h index 92727577d0..1ea4515284 100644 --- a/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h +++ b/libs/gtkmm2ext/gtkmm2ext/gtk_ui.h @@ -92,7 +92,7 @@ class UI : public AbstractUI Glib::signal_idle().connect (bind (slot (&UI::idle_delete<T>), obj)); } - Gdk::Color get_color (const string& prompt, bool& picked, Gdk::Color *initial = 0); + Gdk::Color get_color (const string& prompt, bool& picked, const Gdk::Color *initial = 0); /* starting is sent just before we enter the main loop, stopping just after we return from it (at the top level) |