more changes flowing from a persistent MonitorSection object

[ardour.git] / gtk2_ardour / stripable_colorpicker.cc

diff --git a/gtk2_ardour/stripable_colorpicker.cc b/gtk2_ardour/stripable_colorpicker.cc
index b9c4990cfe1a9450af1d15455679cebb869ed171..c2dfbbb438cf4c930bed96f69552f9bcb1b7f1ea 100644 (file)
--- a/gtk2_ardour/stripable_colorpicker.cc
+++ b/gtk2_ardour/stripable_colorpicker.cc
@@ -17,12 +17,14 @@
  */
 
 #include "pbd/compose.h"
-#include "pbd/i18n.h"
 
+#include "public_editor.h"
 #include "stripable_colorpicker.h"
 #include "ui_config.h"
 #include "utils.h"
 
+#include "pbd/i18n.h"
+
 using namespace Gtk;
 using namespace ARDOUR_UI_UTILS;
 
@@ -33,6 +35,31 @@ StripableColorDialog::StripableColorDialog ()
 {
        initialize_color_palette ();
        signal_response().connect (sigc::mem_fun (*this, &StripableColorDialog::finish_color_edit));
+
+#ifdef __APPLE__
+       /* hide eyedropper button -- which does not work on OSX:
+        * " the problem is worse than just `not getting the color' though.
+        *   The action doesn't actually complete, and window focus is in a
+        *   `weird state' until you click inside the color-picker dialog twice;
+        *   then it all seems back to normal (but no color got picked)"
+        *
+        * the alternative is to patch gtk's source:
+        * gtk/gtkcolorsel.c  gtk_color_selection_init() which packs
+        *
+        *  top_hbox [ VBOX [ triangle || hbox [ sample-area || picker-button] ] || ... ]
+        */
+       ColorSelection* cs = get_colorsel(); // IS-A VBOX
+       if (!cs) { return ; }
+       Gtk::HBox* top_hbox = dynamic_cast<Gtk::HBox*> (cs->children()[0].get_widget());
+       if (!top_hbox) { return ; }
+       Gtk::VBox* vbox = dynamic_cast<Gtk::VBox*> (top_hbox->children()[0].get_widget());
+       if (!vbox) { return ; }
+       Gtk::HBox* hbox = dynamic_cast<Gtk::HBox*> (vbox->children()[1].get_widget());
+       if (!hbox) { return ; }
+       Gtk::Button* picker = dynamic_cast<Gtk::Button*> (hbox->children()[1].get_widget());
+       if (!picker) { return ; }
+       picker->hide ();
+#endif
 }
 
 StripableColorDialog::~StripableColorDialog ()
@@ -77,6 +104,25 @@ StripableColorDialog::reset ()
        _color_changed_connection.disconnect ();
 }
 
+void
+StripableColorDialog::popup (const std::string& name, uint32_t color)
+{
+       set_title (string_compose (_("Color Selection: %1"), name));
+       _initial_color = color;
+
+       get_colorsel()->set_has_opacity_control (false);
+       get_colorsel()->set_has_palette (true);
+
+       Gdk::Color c = gdk_color_from_rgba (_initial_color);
+
+       get_colorsel()->set_previous_color (c);
+       get_colorsel()->set_current_color (c);
+       _color_changed_connection.disconnect ();
+       _color_changed_connection = get_colorsel()->signal_color_changed().connect (sigc::mem_fun (*this, &StripableColorDialog::color_changed));
+
+       present ();
+}
+
 void
 StripableColorDialog::popup (boost::shared_ptr<ARDOUR::Stripable> s)
 {
@@ -92,27 +138,23 @@ StripableColorDialog::popup (boost::shared_ptr<ARDOUR::Stripable> s)
 
        _stripable = s;
        _stripable->set_active_color_picker (this);
-       _initial_color = _stripable->presentation_info().color ();
-       set_title (string_compose (_("Color Selection: %1"), s->name()));
-
-       get_colorsel()->set_has_opacity_control (false);
-       get_colorsel()->set_has_palette (true);
-
-       Gdk::Color c = gdk_color_from_rgba (_initial_color);
-
-       get_colorsel()->set_previous_color (c);
-       get_colorsel()->set_current_color (c);
-       _color_changed_connection = get_colorsel()->signal_color_changed().connect (sigc::mem_fun (*this, &StripableColorDialog::color_changed));
-
-       present ();
+       popup (s->name(), _stripable->presentation_info().color ());
 }
 
 void
 StripableColorDialog::finish_color_edit (int response)
 {
+       ARDOUR::RouteList rl = PublicEditor::instance().get_selection().tracks.routelist();
+
+       if (response == RESPONSE_OK) {
+               ColorChanged (gdk_color_to_rgba (get_colorsel()->get_current_color())); /* EMIT SIGNAL */
+       }
        if (_stripable && response == RESPONSE_OK) {
+               for (ARDOUR::RouteList::iterator i = rl.begin(); i != rl.end(); ++i) {
+                       (*i)->presentation_info().set_color (gdk_color_to_rgba (get_colorsel()->get_current_color()));
+               }
                _stripable->presentation_info().set_color (gdk_color_to_rgba (get_colorsel()->get_current_color()));
-       } else {
+       } else if (_stripable) {
                _stripable->presentation_info().set_color (_initial_color);
        }
        reset ();
@@ -125,3 +167,25 @@ StripableColorDialog::color_changed ()
                _stripable->presentation_info().set_color (gdk_color_to_rgba (get_colorsel()->get_current_color()));
        }
 }
+
+
+ArdourColorButton::ArdourColorButton ()
+{
+       _color_picker.ColorChanged.connect (sigc::mem_fun(*this, &ArdourColorButton::color_selected));
+}
+
+void
+ArdourColorButton::on_clicked ()
+{
+       _color_picker.popup ("", gdk_color_to_rgba (get_color ()));
+       _color_picker.get_window ()->set_transient_for (get_window ());
+}
+
+void
+ArdourColorButton::color_selected (uint32_t color)
+{
+       Gdk::Color c;
+       set_color_from_rgba (c, color);
+       set_color (c);
+       g_signal_emit_by_name (GTK_WIDGET(gobj()), "color-set", 0);
+}