fix default gtk background color

[ardour.git] / gtk2_ardour / visibility_group.cc

diff --git a/gtk2_ardour/visibility_group.cc b/gtk2_ardour/visibility_group.cc
index ecdf12be339dbc8c9c362a6df105c336b290544a..82621283b67fdc63e64b7517b896ae45a8be19a9 100644 (file)
--- a/gtk2_ardour/visibility_group.cc
+++ b/gtk2_ardour/visibility_group.cc
@@ -40,16 +40,20 @@ VisibilityGroup::VisibilityGroup (std::string const & name)
  *  @param id Some single-word ID to be used for the state of this member in XML.
  *  @param name User-visible name for the widget.
  *  @param visible true to default to visible, otherwise false.
+ *  @param override A functor to decide whether the visibility specified by the member should be
+ *  overridden by some external factor; if the returned optional value is given, it will be used
+ *  to override whatever visibility setting the member has.
  */
 
 void
-VisibilityGroup::add (Gtk::Widget* widget, string const & id, string const & name, bool visible)
+VisibilityGroup::add (Gtk::Widget* widget, string const & id, string const & name, bool visible, boost::function<boost::optional<bool> ()> override)
 {
        Member m;
        m.widget = widget;
        m.id = id;
        m.name = name;
        m.visible = visible;
+       m.override = override;
        
        _members.push_back (m);
 }
@@ -84,17 +88,29 @@ VisibilityGroup::menu ()
        return m;
 }
 
+/** @return true if the member should be visible, even taking into account any override functor */
+bool
+VisibilityGroup::should_actually_be_visible (Member const & m) const
+{
+       if (m.override) {
+               boost::optional<bool> o = m.override ();
+               if (o) {
+                       return o.get ();
+               }
+       }
+
+       return m.visible;
+}
+
 /** Update visible consequences of any changes to our _members vector */
 void
 VisibilityGroup::update ()
 {
        for (vector<Member>::iterator i = _members.begin(); i != _members.end(); ++i) {
                if (i->widget) {
-                       if (i->visible) {
-                               cout << "VG show " << i->name << "\n";
+                       if (should_actually_be_visible (*i)) {
                                i->widget->show ();
                        } else {
-                               cout << "VG hide " << i->name << "\n";
                                i->widget->hide ();
                        }
                }
@@ -204,8 +220,8 @@ VisibilityGroup::list_view ()
 
        Gtk::TreeView* v = Gtk::manage (new Gtk::TreeView (_model));
        v->set_headers_visible (false);
-       v->append_column (_(""), _model_columns._visible);
-       v->append_column (_(""), _model_columns._name);
+       v->append_column ("", _model_columns._visible);
+       v->append_column ("", _model_columns._name);
 
        Gtk::CellRendererToggle* visible_cell = dynamic_cast<Gtk::CellRendererToggle*> (v->get_column_cell_renderer (0));
        visible_cell->property_activatable() = true;