smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-11 00:56:33 +01:00
Code Issues Projects Releases Wiki Activity

Remove mouse mode toggling.

Browse source
This commit is contained in:
David Robillard 2014-12-18 20:26:43 -05:00
parent 66870ddf09
commit 341146a975
3 changed files with 0 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gtk2_ardour/editor.cc
View file

@ -668,7 +668,6 @@ Editor::Editor ()
set_snap_to (_snap_type); set_snap_to (_snap_type);
_snap_mode = SnapOff; _snap_mode = SnapOff;
set_snap_mode (_snap_mode); set_snap_mode (_snap_mode);
previous_mouse_mode = MouseObject;
set_mouse_mode (MouseObject, true); set_mouse_mode (MouseObject, true);
pre_internal_mouse_mode = MouseObject; pre_internal_mouse_mode = MouseObject;
pre_internal_snap_type = _snap_type; pre_internal_snap_type = _snap_type;

1
gtk2_ardour/editor.h
View file

@ -544,7 +544,6 @@ class Editor : public PublicEditor, public PBD::ScopedConnectionList, public ARD
void set_samples_per_pixel (framecnt_t); void set_samples_per_pixel (framecnt_t);
Editing::MouseMode mouse_mode; Editing::MouseMode mouse_mode;
Editing::MouseMode previous_mouse_mode;
Editing::MouseMode pre_internal_mouse_mode; Editing::MouseMode pre_internal_mouse_mode;
Editing::SnapType pre_internal_snap_type; Editing::SnapType pre_internal_snap_type;
Editing::SnapMode pre_internal_snap_mode; Editing::SnapMode pre_internal_snap_mode;

9
gtk2_ardour/editor_mouse.cc
View file

@ -292,17 +292,8 @@ Editor::mouse_mode_toggled (MouseMode m)
_session->request_transport_speed (0.0, true); _session->request_transport_speed (0.0, true);
} }
if (mouse_mode == m) {
/* switch to the same mode, act like a toggle and switch back to previous mode */
Glib::RefPtr<Action> pact = get_mouse_mode_action(previous_mouse_mode);
Glib::RefPtr<ToggleAction> ptact = Glib::RefPtr<ToggleAction>::cast_dynamic(pact);
ptact->set_active(true);
return;
}
const bool was_internal = internal_editing(); const bool was_internal = internal_editing();
previous_mouse_mode = mouse_mode;
mouse_mode = m; mouse_mode = m;
if (!was_internal && internal_editing()) { if (!was_internal && internal_editing()) {