mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-08 07:45:00 +01:00
use moved version of reset_focus()
This commit is contained in:
parent
07bb5ff347
commit
c9ece0d6c6
3 changed files with 7 additions and 5 deletions
|
|
@ -37,10 +37,10 @@
|
|||
#include "ardour/tempo.h"
|
||||
#include "ardour/types.h"
|
||||
|
||||
#include "ardour_ui.h"
|
||||
#include "audio_clock.h"
|
||||
#include "gui_thread.h"
|
||||
#include "keyboard.h"
|
||||
#include "public_editor.h"
|
||||
#include "ui_config.h"
|
||||
#include "utils.h"
|
||||
|
||||
|
|
@ -712,7 +712,7 @@ AudioClock::drop_focus ()
|
|||
|
||||
if (has_focus()) {
|
||||
/* move focus back to the default widget in the top level window */
|
||||
PublicEditor::instance().reset_focus (this);
|
||||
ARDOUR_UI::instance()->reset_focus (this);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -21,6 +21,8 @@
|
|||
#include <string>
|
||||
#include <vector>
|
||||
|
||||
#include "gtkmm2ext/utils.h"
|
||||
|
||||
#include "ardour_ui.h"
|
||||
#include "audio_clock.h"
|
||||
#include "big_clock_window.h"
|
||||
|
|
@ -55,7 +57,7 @@ void
|
|||
BigClockWindow::on_unmap ()
|
||||
{
|
||||
ArdourWindow::on_unmap ();
|
||||
PublicEditor::instance().reset_focus (&clock);
|
||||
ARDOUR_UI::instance()->reset_focus (this);
|
||||
}
|
||||
|
||||
bool
|
||||
|
|
|
|||
|
|
@ -572,7 +572,7 @@ Editor::Editor ()
|
|||
|
||||
initialize_canvas ();
|
||||
|
||||
CairoWidget::set_focus_handler (sigc::mem_fun (*this, &Editor::reset_focus));
|
||||
CairoWidget::set_focus_handler (sigc::mem_fun (ARDOUR_UI::instance(), &ARDOUR_UI::reset_focus));
|
||||
|
||||
_summary = new EditorSummary (this);
|
||||
|
||||
|
|
@ -1182,7 +1182,7 @@ Editor::generic_event_handler (GdkEvent* ev)
|
|||
/* leaving window, so reset focus, thus ending any and
|
||||
all text entry operations.
|
||||
*/
|
||||
reset_focus (&contents());
|
||||
ARDOUR_UI::instance()->reset_focus (&contents());
|
||||
break;
|
||||
}
|
||||
break;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue