ardour/livetrax
13
0
Fork 0
Code

Fix the focussing of newly-created marker name entries

Browse Source 
when Config->get_name_new_markers() is true.


git-svn-id: svn://localhost/ardour2/branches/3.0@12144 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2012-05-01 21:34:24 +00:00
parent 6b9d8be707
commit ae787813dd
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gtk2_ardour/location_ui.cc
View File

@ -687,8 +687,9 @@ LocationEditRow::position_lock_style_changed (ARDOUR::Location*)
}
void
LocationEditRow::focus_name() {
name_entry.grab_focus();
LocationEditRow::focus_name()
{
name_entry.grab_focus ();
}
void
@ -862,9 +863,9 @@ LocationUI::location_redraw_ranges ()
}
struct LocationSortByStart {
bool operator() (Location *a, Location *b) {
return a->start() < b->start();
}
bool operator() (Location *a, Location *b) {
return a->start() < b->start();
}
};
void
@ -879,7 +880,7 @@ LocationUI::location_added (Location* location)
loc.sort (LocationSortByStart ());
LocationEditRow* erow = manage (new LocationEditRow (_session, location));
erow->set_clock_group (*_clock_group);
erow->remove_requested.connect (sigc::mem_fun (*this, &LocationUI::location_remove_requested));
@ -910,6 +911,11 @@ LocationUI::location_added (Location* location)
range_rows.show_all ();
location_rows.show_all ();
if (location == newest_location) {
newest_location = 0;
erow->focus_name();
}
}
}
@ -959,10 +965,6 @@ LocationUI::map_locations (Locations::LocationList& locations)
Box_Helpers::BoxList & loc_children = location_rows.children();
loc_children.push_back(Box_Helpers::Element(*erow, PACK_SHRINK, 1, PACK_START));
if (location == newest_location) {
newest_location = 0;
erow->focus_name();
}
} else if (location->is_auto_punch()) {
punch_edit_row.set_session (_session);
punch_edit_row.set_location (location);

4
gtk2_ardour/location_ui.h
View File

@ -162,6 +162,10 @@ class LocationUI : public Gtk::HBox, public ARDOUR::SessionHandlePtr
private:
ARDOUR::LocationStack* locations;
/** set to the location that has just been created with the LocationUI `add' button
(if Config->get_name_new_markers() is true); if it is non-0, the name entry of
the location is given the focus by location_added().
*/
ARDOUR::Location *newest_location;
void session_going_away ();