ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

better solution to the big clock window focus issue

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@10701 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2011-11-19 02:43:24 +00:00
parent 82cd0093d6
commit 965f77aaeb
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gtk2_ardour/ardour_ui_ed.cc
View File

@ -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());
}

2
gtk2_ardour/audio_clock.cc
View File

@ -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 */

1
gtk2_ardour/audio_clock.h
View File

@ -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;