X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fgroup_tabs.cc;h=be505b8c0d59f7f54db80758d2f1b1da3f18e36f;hb=8509b5fddc538853a80c97dfdb5b425996bf9662;hp=3a35ceb064e9bf8d44790444536b4b7a059ab372;hpb=5468eb57886af60a2e5eeafb93cb8d8f79ab62f4;p=ardour.git diff --git a/gtk2_ardour/group_tabs.cc b/gtk2_ardour/group_tabs.cc index 3a35ceb064..be505b8c0d 100644 --- a/gtk2_ardour/group_tabs.cc +++ b/gtk2_ardour/group_tabs.cc @@ -28,11 +28,14 @@ #include "keyboard.h" #include "i18n.h" #include "ardour_ui.h" +#include "rgb_macros.h" +#include "ui_config.h" #include "utils.h" using namespace std; using namespace Gtk; using namespace ARDOUR; +using namespace ARDOUR_UI_UTILS; using Gtkmm2ext::Keyboard; list GroupTabs::_used_colors; @@ -42,7 +45,8 @@ GroupTabs::GroupTabs () , _dragging (0) , _dragging_new_tab (0) { - + add_events (Gdk::BUTTON_PRESS_MASK|Gdk::BUTTON_RELEASE_MASK|Gdk::POINTER_MOTION_MASK); + UIConfiguration::instance().ColorsChanged.connect (sigc::mem_fun (*this, &GroupTabs::queue_draw)); } GroupTabs::~GroupTabs () @@ -65,7 +69,7 @@ GroupTabs::set_session (Session* s) _session->RouteRemovedFromRouteGroup.connect ( _session_connections, invalidator (*this), boost::bind (&GroupTabs::route_removed_from_route_group, this, _1, _2), gui_context() ); - + _session->route_group_removed.connect (_session_connections, invalidator (*this), boost::bind (&GroupTabs::set_dirty, this), gui_context()); } } @@ -134,13 +138,13 @@ GroupTabs::on_button_press_event (GdkEventButton* ev) } else if (ev->button == 3) { RouteGroup* g = t ? t->group : 0; - + if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier) && g) { /* edit */ RouteGroupDialog d (g, false); d.do_run (); } else { - Menu* m = get_menu (g); + Menu* m = get_menu (g, true); if (m) { m->popup (ev->button, ev->time); } @@ -175,28 +179,30 @@ GroupTabs::on_motion_notify_event (GdkEventMotion* ev) set_dirty (); queue_draw (); + gdk_event_request_motions(ev); + return true; } bool -GroupTabs::on_button_release_event (GdkEventButton* ev) +GroupTabs::on_button_release_event (GdkEventButton*) { if (_dragging == 0) { return false; } - + if (!_drag_moved) { - + if (_dragging->group) { /* toggle active state */ _dragging->group->set_active (!_dragging->group->is_active (), this); } - + } else { /* finish drag */ RouteList routes = routes_for_tab (_dragging); - + if (!routes.empty()) { if (_dragging_new_tab) { RouteGroup* g = create_and_add_group (); @@ -208,13 +214,13 @@ GroupTabs::on_button_release_event (GdkEventButton* ev) } else { boost::shared_ptr r = _session->get_routes (); for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { - + bool const was_in_tab = find ( _initial_dragging_routes.begin(), _initial_dragging_routes.end(), *i ) != _initial_dragging_routes.end (); - + bool const now_in_tab = find (routes.begin(), routes.end(), *i) != routes.end(); - + if (was_in_tab && !now_in_tab) { _dragging->group->remove (*i); } else if (!was_in_tab && now_in_tab) { @@ -223,11 +229,11 @@ GroupTabs::on_button_release_event (GdkEventButton* ev) } } } - + set_dirty (); queue_draw (); } - + _dragging = 0; _initial_dragging_routes.clear (); @@ -235,7 +241,7 @@ GroupTabs::on_button_release_event (GdkEventButton* ev) } void -GroupTabs::render (cairo_t* cr) +GroupTabs::render (cairo_t* cr, cairo_rectangle_t*) { if (_dragging == 0) { _tabs = compute_tabs (); @@ -243,7 +249,9 @@ GroupTabs::render (cairo_t* cr) /* background */ - cairo_set_source_rgb (cr, 0, 0, 0); + Gdk::Color c = get_style()->get_base (Gtk::STATE_NORMAL); + + cairo_set_source_rgb (cr, c.get_red_p(), c.get_green_p(), c.get_blue_p()); cairo_rectangle (cr, 0, 0, get_width(), get_height()); cairo_fill (cr); @@ -293,7 +301,7 @@ GroupTabs::click_to_tab (double c, list::iterator* prev, list::iterato } Gtk::Menu* -GroupTabs::get_menu (RouteGroup* g) +GroupTabs::get_menu (RouteGroup* g, bool TabArea) { using namespace Menu_Helpers; @@ -309,16 +317,24 @@ GroupTabs::get_menu (RouteGroup* g) _menu->set_name ("ArdourContextMenu"); MenuList& items = _menu->items(); - items.push_back (MenuElem (_("New..."), hide_return (sigc::mem_fun(*this, &GroupTabs::create_and_add_group)))); - items.push_back (MenuElem (_("New From"), *new_from)); + if (!TabArea) { + items.push_back (MenuElem (_("Create New Group ..."), hide_return (sigc::mem_fun(*this, &GroupTabs::create_and_add_group)))); + } + + items.push_back (MenuElem (_("Create New Group From"), *new_from)); if (g) { - items.push_back (MenuElem (_("Edit..."), sigc::bind (sigc::mem_fun (*this, &GroupTabs::edit_group), g))); - items.push_back (MenuElem (_("Add New Subgroup Bus"), sigc::bind (sigc::mem_fun (*this, &GroupTabs::subgroup), g, false, PreFader))); + items.push_back (MenuElem (_("Edit Group..."), sigc::bind (sigc::mem_fun (*this, &GroupTabs::edit_group), g))); + items.push_back (MenuElem (_("Collect Group"), sigc::bind (sigc::mem_fun (*this, &GroupTabs::collect), g))); + items.push_back (MenuElem (_("Remove Group"), sigc::bind (sigc::mem_fun (*this, &GroupTabs::remove_group), g))); + items.push_back (SeparatorElem()); + if (g->has_subgroup()) { + items.push_back (MenuElem (_("Remove Subgroup Bus"), sigc::bind (sigc::mem_fun (*this, &GroupTabs::un_subgroup), g))); + } else { + items.push_back (MenuElem (_("Add New Subgroup Bus"), sigc::bind (sigc::mem_fun (*this, &GroupTabs::subgroup), g, false, PreFader))); + } items.push_back (MenuElem (_("Add New Aux Bus (pre-fader)"), sigc::bind (sigc::mem_fun (*this, &GroupTabs::subgroup), g, true, PreFader))); items.push_back (MenuElem (_("Add New Aux Bus (post-fader)"), sigc::bind (sigc::mem_fun (*this, &GroupTabs::subgroup), g, true, PostFader))); - items.push_back (MenuElem (_("Collect"), sigc::bind (sigc::mem_fun (*this, &GroupTabs::collect), g))); - items.push_back (MenuElem (_("Remove"), sigc::bind (sigc::mem_fun (*this, &GroupTabs::remove_group), g))); } add_menu_items (_menu, g); @@ -386,8 +402,6 @@ void GroupTabs::run_new_group_dialog (RouteList const & rl) { RouteGroup* g = new RouteGroup (*_session, ""); - g->apply_changes (default_properties ()); - RouteGroupDialog d (g, true); if (d.do_run ()) { @@ -404,9 +418,6 @@ RouteGroup * GroupTabs::create_and_add_group () const { RouteGroup* g = new RouteGroup (*_session, ""); - - g->apply_changes (default_properties ()); - RouteGroupDialog d (g, true); if (d.do_run ()) { @@ -431,25 +442,22 @@ GroupTabs::subgroup (RouteGroup* g, bool aux, Placement placement) g->make_subgroup (aux, placement); } -struct CollectSorter { - CollectSorter (string const & key) : _key (key) {} +void +GroupTabs::un_subgroup (RouteGroup* g) +{ + g->destroy_subgroup (); +} +struct CollectSorter { bool operator () (boost::shared_ptr a, boost::shared_ptr b) { - return a->order_key (_key) < b->order_key (_key); + return a->order_key () < b->order_key (); } - - string _key; }; struct OrderSorter { - OrderSorter (string const & key) : _key (key) {} - bool operator() (boost::shared_ptr a, boost::shared_ptr b) { - /* use of ">" forces the correct sort order */ - return a->order_key (_key) < b->order_key (_key); + return a->order_key () < b->order_key (); } - - string _key; }; /** Collect all members of a RouteGroup so that they are together in the Editor or Mixer. @@ -459,19 +467,19 @@ void GroupTabs::collect (RouteGroup* g) { boost::shared_ptr group_routes = g->route_list (); - group_routes->sort (CollectSorter (order_key ())); + group_routes->sort (CollectSorter ()); int const N = group_routes->size (); RouteList::iterator i = group_routes->begin (); boost::shared_ptr routes = _session->get_routes (); - routes->sort (OrderSorter (order_key ())); + routes->sort (OrderSorter ()); RouteList::const_iterator j = routes->begin (); int diff = 0; int coll = -1; while (i != group_routes->end() && j != routes->end()) { - int const k = (*j)->order_key (order_key ()); + int const k = (*j)->order_key (); if (*i == *j) { @@ -482,14 +490,14 @@ GroupTabs::collect (RouteGroup* g) --diff; } - (*j)->set_order_key (order_key (), coll); + (*j)->set_order_key (coll); ++coll; ++i; } else { - (*j)->set_order_key (order_key (), k + diff); + (*j)->set_order_key (k + diff); } @@ -529,23 +537,34 @@ GroupTabs::remove_group (RouteGroup* g) /** Set the color of the tab of a route group */ void -GroupTabs::set_group_color (RouteGroup* group, Gdk::Color color) +GroupTabs::set_group_color (RouteGroup* group, uint32_t color) { assert (group); + uint32_t r, g, b, a; + + UINT_TO_RGBA (color, &r, &g, &b, &a); /* Hack to disallow black route groups; force a dark grey instead */ - if (color.get_red() == 0 && color.get_green() == 0 && color.get_blue() == 0) { - color.set_grey_p (0.1); + + if (r == 0 && g == 0 && b == 0) { + r = 25; + g = 25; + b = 25; } - + GUIObjectState& gui_state = *ARDOUR_UI::instance()->gui_object_state; char buf[64]; - snprintf (buf, sizeof (buf), "%d:%d:%d", color.get_red(), color.get_green(), color.get_blue()); - gui_state.set (group_gui_id (group), "color", buf); - + + /* for historical reasons the colors must be stored as 16 bit color + * values. Ugh. + */ + + snprintf (buf, sizeof (buf), "%d:%d:%d", (r<<8), (g<<8), (b<<8)); + gui_state.set_property (group_gui_id (group), "color", buf); + /* the group color change notification */ - + PBD::PropertyChange change; change.add (Properties::color); group->PropertyChanged (change); @@ -571,35 +590,35 @@ GroupTabs::group_gui_id (RouteGroup* group) } /** @return the color to use for a route group tab */ -Gdk::Color +uint32_t GroupTabs::group_color (RouteGroup* group) { assert (group); - - GUIObjectState& gui_state = *ARDOUR_UI::instance()->gui_object_state; + GUIObjectState& gui_state = *ARDOUR_UI::instance()->gui_object_state; string const gui_id = group_gui_id (group); - bool empty; string const color = gui_state.get_string (gui_id, "color", &empty); + if (empty) { /* no color has yet been set, so use a random one */ - Gdk::Color const color = unique_random_color (_used_colors); - set_group_color (group, color); - return color; + uint32_t c = gdk_color_to_rgba (unique_random_color (_used_colors)); + set_group_color (group, c); + return c; } - Gdk::Color c; - int r, g, b; + /* for historical reasons, colors are stored as 16 bit values. + */ + sscanf (color.c_str(), "%d:%d:%d", &r, &g, &b); - c.set_red (r); - c.set_green (g); - c.set_blue (b); - - return c; + r /= 256; + g /= 256; + b /= 256; + + return RGBA_TO_UINT (r, g, b, 255); } void @@ -611,7 +630,7 @@ GroupTabs::route_group_property_changed (RouteGroup* rg) */ emit_gui_changed_for_members (rg); - + set_dirty (); }