diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-11-19 02:43:24 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-11-19 02:43:24 +0000 |
| commit | 965f77aaeb1117bd829690a54dd94c789a9c03dd (patch) | |
| tree | a76082bef4b7d7a02494e0fd06c9e6db04160a97 /gtk2_ardour | |
| parent | 82cd0093d6051545d9581d4b25a5c8779711e479 (diff) | |
better solution to the big clock window focus issue
git-svn-id: svn://localhost/ardour2/branches/3.0@10701 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/ardour_ui_ed.cc | 5 | ||||
| -rw-r--r-- | gtk2_ardour/audio_clock.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/audio_clock.h | 1 |
3 files changed, 2 insertions, 6 deletions
diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc index 6295400e32..e661f05fe6 100644 --- a/gtk2_ardour/ardour_ui_ed.cc +++ b/gtk2_ardour/ardour_ui_ed.cc @@ -633,7 +633,6 @@ ARDOUR_UI::use_menubar_as_top_menubar () void ARDOUR_UI::big_clock_catch_focus () { - cerr << "catch BC focus\n"; PublicEditor::instance().reset_focus (); } @@ -650,11 +649,11 @@ ARDOUR_UI::setup_clock () big_clock_window->get()->set_title (_("Big Clock")); big_clock_window->get()->signal_realize().connect (sigc::mem_fun (*this, &ARDOUR_UI::big_clock_realized)); - big_clock_window->get()->signal_unmap().connect (sigc::bind (sigc::ptr_fun(&ActionManager::uncheck_toggleaction), X_("<Actions>/Common/ToggleBigClock"))); big_clock_window->get()->signal_key_press_event().connect (sigc::bind (sigc::ptr_fun (relay_key_press), big_clock_window->get()), false); big_clock_window->get()->signal_size_allocate().connect (sigc::mem_fun (*this, &ARDOUR_UI::big_clock_size_allocate)); - big_clock->DropFocus.connect (sigc::mem_fun (*this, &ARDOUR_UI::big_clock_catch_focus)); + big_clock_window->get()->signal_unmap().connect (sigc::bind (sigc::ptr_fun(&ActionManager::uncheck_toggleaction), X_("<Actions>/Common/ToggleBigClock"))); + big_clock_window->get()->signal_unmap().connect (sigc::mem_fun (*this, &ARDOUR_UI::big_clock_catch_focus)); manage_window (*big_clock_window->get()); } diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc index 6e736d248e..3dbdfa8598 100644 --- a/gtk2_ardour/audio_clock.cc +++ b/gtk2_ardour/audio_clock.cc @@ -489,8 +489,6 @@ AudioClock::drop_focus () { Keyboard::magic_widget_drop_focus (); - DropFocus (); /* EMIT SIGNAL */ - if (has_focus()) { /* move focus back to the default widget in the top level window */ diff --git a/gtk2_ardour/audio_clock.h b/gtk2_ardour/audio_clock.h index 1acff95612..f4681c279c 100644 --- a/gtk2_ardour/audio_clock.h +++ b/gtk2_ardour/audio_clock.h @@ -78,7 +78,6 @@ class AudioClock : public CairoWidget, public ARDOUR::SessionHandlePtr sigc::signal<void> ValueChanged; sigc::signal<void> mode_changed; sigc::signal<void> ChangeAborted; - sigc::signal<void> DropFocus; static sigc::signal<void> ModeChanged; static std::vector<AudioClock*> clocks; |