Changing active-state needs no color lookup

[ardour.git] / gtk2_ardour / axis_view.cc

diff --git a/gtk2_ardour/axis_view.cc b/gtk2_ardour/axis_view.cc
index ab6d4423282261dd03b2496a2f4c68325a9c7eae..03ae8a4a571db1bbd3e1d389e5b0968f0728439f 100644 (file)
--- a/gtk2_ardour/axis_view.cc
+++ b/gtk2_ardour/axis_view.cc
@@ -1,21 +1,25 @@
 /*
-    Copyright (C) 2003 Paul Davis
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
+ * Copyright (C) 2005-2017 Paul Davis <paul@linuxaudiosystems.com>
+ * Copyright (C) 2005 Taybin Rutkin <taybin@taybin.com>
+ * Copyright (C) 2009-2011 Carl Hetherington <carl@carlh.net>
+ * Copyright (C) 2009-2012 David Robillard <d@drobilla.net>
+ * Copyright (C) 2014-2018 Robin Gareus <robin@gareus.org>
+ * Copyright (C) 2016 Tim Mayberry <mojofunk@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 #include <cstdlib>
 #include <cmath>
@@ -29,15 +33,17 @@
 #include "pbd/convert.h"
 
 #include <gtkmm2ext/utils.h>
-#include <gtkmm2ext/selector.h>
 #include <gtkmm2ext/gtk_ui.h>
 
+#include "ardour/selection.h"
+
 #include "public_editor.h"
 #include "ardour_ui.h"
 #include "gui_object.h"
 #include "axis_view.h"
 #include "utils.h"
-#include "i18n.h"
+
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace Gtk;
@@ -49,7 +55,6 @@ list<Gdk::Color> AxisView::used_colors;
 
 AxisView::AxisView ()
 {
-       _selected = false;
 }
 
 AxisView::~AxisView()
@@ -68,29 +73,54 @@ AxisView::gui_property (const string& property_name) const
        if (property_hashtable.count(property_name)) {
                return property_hashtable[property_name];
        } else {
-         string rv = gui_object_state().get_string (state_id(), property_name);
+               string rv = gui_object_state().get_string (state_id(), property_name);
                property_hashtable.erase(property_name);
                property_hashtable.emplace(property_name, rv);
                return rv;
        }
 }
 
+bool
+AxisView::get_gui_property (const std::string& property_name, std::string& value) const
+{
+       std::string str = gui_property(property_name);
+
+       if (!str.empty()) {
+               value = str;
+               return true;
+       }
+
+       return false;
+}
+
+void
+AxisView::set_gui_property (const std::string& property_name, const std::string& value)
+{
+       property_hashtable.erase (property_name);
+       property_hashtable.emplace (property_name, value);
+       gui_object_state ().set_property (state_id (), property_name, value);
+}
+
 bool
 AxisView::marked_for_display () const
 {
-       string const v = gui_property ("visible");
-       return (v == "" || PBD::string_is_affirmative (v));
+       bool visible;
+       if (!get_gui_property ("visible", visible)) {
+               return true;
+       }
+       return visible;
 }
 
 bool
 AxisView::set_marked_for_display (bool yn)
 {
-       string const v = gui_property ("visible");
-       if (v == "" || yn != PBD::string_is_affirmative (v)) {
-               set_gui_property ("visible", yn);
-               return true; // things changed
+       bool visible;
+       if (get_gui_property ("visible", visible) && visible == yn) {
+               return false; // nothing changed
        }
-       return false;
+
+       set_gui_property ("visible", yn);
+       return true; // things changed
 }
 
 GUIObjectState&
@@ -98,3 +128,13 @@ AxisView::gui_object_state()
 {
        return *ARDOUR_UI::instance()->gui_object_state;
 }
+
+void
+AxisView::set_selected (bool yn)
+{
+       if (selected() == yn) {
+               return;
+       }
+
+       Selectable::set_selected (yn);
+}