ardour/livetrax
13
0
Fork 0
Code

Section Arranger: overhaul selection and keyboard interaction

Browse Source 
* clear treeview selection when time selectoin changes
* act on key-down for consitency, also helps with properly
  prpagating shortcuts
This commit is contained in:
Robin Gareus 2023-08-27 16:45:35 +02:00
parent b92e3e6695
commit 40719ec67d
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
2 changed files with 16 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
gtk2_ardour/editor_sections.cc
View File

@ -40,8 +40,7 @@ using namespace Gtk;
using namespace ARDOUR;
EditorSections::EditorSections ()
: _old_focus (0)
, _no_redisplay (false)
: _no_redisplay (false)
{
_model = ListStore::create (_columns);
_view.set_model (_model);
@ -54,7 +53,7 @@ EditorSections::EditorSections ()
_scroller.add (_view);
_scroller.set_policy (Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC);
_view.signal_key_release_event ().connect (sigc::mem_fun (*this, &EditorSections::key_release), false);
_view.signal_key_press_event ().connect (sigc::mem_fun (*this, &EditorSections::key_press), false);
_view.signal_button_press_event ().connect (sigc::mem_fun (*this, &EditorSections::button_press), false);
_view.get_selection ()->signal_changed ().connect (sigc::mem_fun (*this, &EditorSections::selection_changed));
@ -74,10 +73,10 @@ EditorSections::EditorSections ()
/* Allow to scroll using key up/down */
_view.signal_enter_notify_event ().connect (sigc::mem_fun (*this, &EditorSections::enter_notify), false);
_view.signal_leave_notify_event ().connect (sigc::mem_fun (*this, &EditorSections::leave_notify), false);
_scroller.signal_focus_in_event ().connect (sigc::mem_fun (*this, &EditorSections::focus_in), false);
_scroller.signal_focus_out_event ().connect (sigc::mem_fun (*this, &EditorSections::focus_out));
ARDOUR_UI::instance ()->primary_clock->mode_changed.connect (sigc::mem_fun (*this, &EditorSections::clock_format_changed));
_selection_change = PublicEditor::instance ().get_selection ().TimeChanged.connect (sigc::mem_fun (*this, &EditorSections::clear_selection));
}
void
@ -179,6 +178,12 @@ EditorSections::scroll_row_timeout ()
return true;
}
void
EditorSections::clear_selection ()
{
_view.get_selection ()->unselect_all ();
}
void
EditorSections::selection_changed ()
{
@ -191,8 +196,10 @@ EditorSections::selection_changed ()
timepos_t start = row[_columns.start];
timepos_t end = row[_columns.end];
_selection_change.block ();
Selection& s (PublicEditor::instance ().get_selection ());
s.set (start, end);
_selection_change.unblock ();
}
void
@ -362,7 +369,7 @@ EditorSections::delete_selected_section ()
}
bool
EditorSections::key_release (GdkEventKey* ev)
EditorSections::key_press (GdkEventKey* ev)
{
switch (ev->keyval) {
case GDK_KP_Delete:
@ -407,31 +414,6 @@ EditorSections::button_press (GdkEventButton* ev)
return false;
}
bool
EditorSections::focus_in (GdkEventFocus*)
{
Window* win = dynamic_cast<Window*> (_scroller.get_toplevel ());
if (win) {
_old_focus = win->get_focus ();
} else {
_old_focus = 0;
}
/* try to do nothing on focus in (doesn't work, hence selection_count nonsense) */
return true;
}
bool
EditorSections::focus_out (GdkEventFocus*)
{
if (_old_focus) {
_old_focus->grab_focus ();
_old_focus = 0;
}
return false;
}
bool
EditorSections::enter_notify (GdkEventCrossing*)
{
@ -442,11 +424,6 @@ EditorSections::enter_notify (GdkEventCrossing*)
bool
EditorSections::leave_notify (GdkEventCrossing* ev)
{
if (_old_focus) {
_old_focus->grab_focus ();
_old_focus = 0;
}
if (ev->detail != GDK_NOTIFY_INFERIOR && ev->detail != GDK_NOTIFY_ANCESTOR) {
Gtkmm2ext::Keyboard::magic_widget_drop_focus ();
}

7
gtk2_ardour/editor_sections.h
View File

@ -43,15 +43,14 @@ private:
void redisplay ();
bool delete_selected_section ();
void clear_selection ();
void selection_changed ();
void clock_format_changed ();
bool scroll_row_timeout ();
void show_context_menu (int, int);
bool key_release (GdkEventKey*);
bool key_press (GdkEventKey*);
bool button_press (GdkEventButton*);
bool focus_in (GdkEventFocus*);
bool focus_out (GdkEventFocus*);
bool enter_notify (GdkEventCrossing*);
bool leave_notify (GdkEventCrossing*);
@ -103,10 +102,10 @@ private:
Glib::RefPtr<Gtk::ListStore> _model;
Gtk::TreeView _view;
Gtk::ScrolledWindow _scroller;
Gtk::Widget* _old_focus;
bool _no_redisplay;
sigc::connection _scroll_timeout;
sigc::connection _selection_change;
};
#endif