From 45ff98fcc3b7a30639704985722be998685beaad Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 16 Mar 2010 20:16:13 +0000 Subject: fix previous patch from lucus git-svn-id: svn://localhost/ardour2/branches/3.0@6766 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/editor_mouse.cc | 4 ++-- gtk2_ardour/route_params_ui.cc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index ee28ff6804..a67406f93c 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -635,10 +635,10 @@ Editor::button_press_handler_1 (ArdourCanvas::Item* item, GdkEvent* event, ItemT case SelectionItem: if (Keyboard::modifier_state_contains - (event->button.state, Keyboard::ModifierMask(Keyboard::SecondaryModifier))) { + (event->button.state, Keyboard::ModifierMask(Keyboard::PrimaryModifier))) { // contains and not equals because I can't use alt as a modifier alone. start_selection_grab (item, event); - } else if (Keyboard::modifier_state_equals (event->button.state, Keyboard::PrimaryModifier)) { + } else if (Keyboard::modifier_state_equals (event->button.state, Keyboard::SecondaryModifier)) { /* grab selection for moving */ _drags->set (new SelectionDrag (this, item, SelectionDrag::SelectionMove), event); } else { diff --git a/gtk2_ardour/route_params_ui.cc b/gtk2_ardour/route_params_ui.cc index 288490d7be..5378ab8c99 100644 --- a/gtk2_ardour/route_params_ui.cc +++ b/gtk2_ardour/route_params_ui.cc @@ -93,7 +93,7 @@ RouteParams_UI::RouteParams_UI () route_display.set_headers_visible(true); route_display.set_headers_clickable(true); - dynamic_cast(route_display.get_column_cell_renderer(0))->property_ellipsize() = true; /* LT */ + dynamic_cast(route_display.get_column_cell_renderer(0))->property_ellipsize() = Pango::ELLIPSIZE_START; route_select_scroller.add(route_display); route_select_scroller.set_policy(Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC); -- cgit v1.2.3