diff options
| author | Ben Loftis <ben@harrisonconsoles.com> | 2014-08-21 11:13:23 -0500 |
|---|---|---|
| committer | Ben Loftis <ben@harrisonconsoles.com> | 2014-08-22 11:49:59 -0500 |
| commit | a7226133a990afa294339ffa735f9dee8eff97e4 (patch) | |
| tree | 9c5aaf424f062ce68376ab90616a2f04ca567f5d | |
| parent | c29417f48e60b35b1817ba7ac2568b39a74f8f10 (diff) | |
refactor _grabbed into cairo_widget
| -rw-r--r-- | gtk2_ardour/ardour_knob.cc | 1 | ||||
| -rw-r--r-- | gtk2_ardour/ardour_knob.h | 1 | ||||
| -rw-r--r-- | libs/gtkmm2ext/cairo_widget.cc | 1 | ||||
| -rw-r--r-- | libs/gtkmm2ext/gtkmm2ext/cairo_widget.h | 2 |
4 files changed, 3 insertions, 2 deletions
diff --git a/gtk2_ardour/ardour_knob.cc b/gtk2_ardour/ardour_knob.cc index 7021cb9df1..92b10a3cea 100644 --- a/gtk2_ardour/ardour_knob.cc +++ b/gtk2_ardour/ardour_knob.cc @@ -56,7 +56,6 @@ ArdourKnob::Element ArdourKnob::default_elements = ArdourKnob::Element (ArdourKn ArdourKnob::ArdourKnob (Element e) : _elements (e) , _hovering (false) - , _grabbed (false) { ARDOUR_UI_UTILS::ColorsChanged.connect (sigc::mem_fun (*this, &ArdourKnob::color_handler)); } diff --git a/gtk2_ardour/ardour_knob.h b/gtk2_ardour/ardour_knob.h index 1a318a21dc..3a9c2bd7ff 100644 --- a/gtk2_ardour/ardour_knob.h +++ b/gtk2_ardour/ardour_knob.h @@ -84,7 +84,6 @@ public: BindingProxy binding_proxy; bool _hovering; - bool _grabbed; float _grabbed_y; float _val; //percent of knob travel diff --git a/libs/gtkmm2ext/cairo_widget.cc b/libs/gtkmm2ext/cairo_widget.cc index b7d9b08c72..47c0fdb9c1 100644 --- a/libs/gtkmm2ext/cairo_widget.cc +++ b/libs/gtkmm2ext/cairo_widget.cc @@ -28,6 +28,7 @@ CairoWidget::CairoWidget () : _active_state (Gtkmm2ext::Off) , _visual_state (Gtkmm2ext::NoVisualState) , _need_bg (true) + , _grabbed (false) , _name_proxy (this, X_("name")) { _name_proxy.connect (sigc::mem_fun (*this, &CairoWidget::on_name_changed)); diff --git a/libs/gtkmm2ext/gtkmm2ext/cairo_widget.h b/libs/gtkmm2ext/gtkmm2ext/cairo_widget.h index 604abb7a71..fff63b9ed9 100644 --- a/libs/gtkmm2ext/gtkmm2ext/cairo_widget.h +++ b/libs/gtkmm2ext/gtkmm2ext/cairo_widget.h @@ -85,6 +85,8 @@ protected: Gtkmm2ext::ActiveState _active_state; Gtkmm2ext::VisualState _visual_state; bool _need_bg; + + bool _grabbed; private: Glib::SignalProxyProperty _name_proxy; |