diff options
author | Carl Hetherington <carl@carlh.net> | 2011-02-08 14:08:05 +0000 |
---|---|---|
committer | Carl Hetherington <carl@carlh.net> | 2011-02-08 14:08:05 +0000 |
commit | ce91b0953b1f45fb378ab7ea72cfefbb607000e6 (patch) | |
tree | c17a7842e694eac48fbf3456220b9efa5cf59be2 | |
parent | ff6038a7b70c1945843dcd44ffe666d297949e91 (diff) |
Remove always-true should_show_selection code.
git-svn-id: svn://localhost/ardour2/branches/3.0@8769 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rw-r--r-- | gtk2_ardour/audio_region_view.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/editor_mouse.cc | 3 | ||||
-rw-r--r-- | gtk2_ardour/midi_region_view.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/time_axis_view_item.cc | 18 | ||||
-rw-r--r-- | gtk2_ardour/time_axis_view_item.h | 4 |
5 files changed, 3 insertions, 26 deletions
diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc index 51a016d2c3..e6028c61a8 100644 --- a/gtk2_ardour/audio_region_view.cc +++ b/gtk2_ardour/audio_region_view.cc @@ -1318,7 +1318,7 @@ AudioRegionView::set_frame_color () fill_opacity = 0; } - if (_selected && should_show_selection) { + if (_selected) { if (fill_opacity) { frame->property_fill_color_rgba() = UINT_RGBA_CHANGE_A (ARDOUR_UI::config()->canvasvar_SelectedFrameBase.get(), fill_opacity); } else { diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index e73975ba85..a90483b540 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -378,9 +378,6 @@ Editor::mouse_mode_toggled (MouseMode m) show the object (region) selection. */ - for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) { - (*i)->set_should_show_selection (true); - } for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) { (*i)->hide_selection (); } diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc index af79a4f2b8..52980e7270 100644 --- a/gtk2_ardour/midi_region_view.cc +++ b/gtk2_ardour/midi_region_view.cc @@ -2869,7 +2869,7 @@ void MidiRegionView::set_frame_color() { if (frame) { - if (_selected && should_show_selection) { + if (_selected) { frame->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_SelectedFrameBase.get(); } else { frame->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_MidiFrameBase.get(); diff --git a/gtk2_ardour/time_axis_view_item.cc b/gtk2_ardour/time_axis_view_item.cc index 0a2c815c48..a864310a8a 100644 --- a/gtk2_ardour/time_axis_view_item.cc +++ b/gtk2_ardour/time_axis_view_item.cc @@ -141,7 +141,6 @@ TimeAxisViewItem::init ( { item_name = it_name; samples_per_unit = spu; - should_show_selection = true; frame_position = start; item_duration = duration; name_connected = false; @@ -459,21 +458,6 @@ TimeAxisViewItem::set_selected(bool yn) } } -/** - * Set whether an item should show its selection status. - * - * @param yn true if this item should show its selected status - */ - -void -TimeAxisViewItem::set_should_show_selection (bool yn) -{ - if (should_show_selection != yn) { - should_show_selection = yn; - set_frame_color (); - } -} - /** @return the TimeAxisView that this item is on */ TimeAxisView& TimeAxisViewItem::get_time_axis_view () const @@ -698,7 +682,7 @@ TimeAxisViewItem::set_frame_color() return; } - if (_selected && should_show_selection) { + if (_selected) { frame->property_fill_color_rgba() = ARDOUR_UI::config()->canvasvar_SelectedFrameBase.get(); } else { if (_recregion) { diff --git a/gtk2_ardour/time_axis_view_item.h b/gtk2_ardour/time_axis_view_item.h index d51bacc7cb..26f8c07f7a 100644 --- a/gtk2_ardour/time_axis_view_item.h +++ b/gtk2_ardour/time_axis_view_item.h @@ -61,7 +61,6 @@ class TimeAxisViewItem : public Selectable, public PBD::ScopedConnectionList void set_item_name(std::string, void*); virtual std::string get_item_name() const; virtual void set_selected(bool yn); - virtual void set_should_show_selection (bool yn); void set_sensitive (bool yn) { _sensitive = yn; } bool sensitive () const { return _sensitive; } TimeAxisView& get_time_axis_view () const; @@ -186,9 +185,6 @@ class TimeAxisViewItem : public Selectable, public PBD::ScopedConnectionList /** samples per canvas unit */ double samples_per_unit; - /** should the item show its selected status */ - bool should_show_selection; - /** should the item respond to events */ bool _sensitive; |