ardour/livetrax
13
0
Fork 0
Code

track-color chooser works

Browse Source 
git-svn-id: svn://localhost/trunk/ardour2@196 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Karsten Wiese 2005-12-18 12:02:42 +00:00
parent d2b8a7f6bd
commit 46627353ad
4 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gtk2_ardour/route_ui.cc
View File

@ -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, &current);
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];

2
gtk2_ardour/route_ui.h
View File

@ -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;

2
libs/gtkmm2ext/gtk_ui.cc
View File

@ -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;

2
libs/gtkmm2ext/gtkmm2ext/gtk_ui.h
View File

@ -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)