ArdourDialog::ArdourDialog (string title, bool modal, bool use_seperator)
: Dialog (title, modal, use_seperator)
, proxy (0)
- , _splash_pushed (false)
+ , _splash_pushed (false)
{
init ();
- set_position (Gtk::WIN_POS_CENTER);
+ set_position (Gtk::WIN_POS_MOUSE);
}
ArdourDialog::ArdourDialog (Gtk::Window& parent, string title, bool modal, bool use_seperator)
: Dialog (title, parent, modal, use_seperator)
- , _splash_pushed (false)
+ , _splash_pushed (false)
{
init ();
set_position (Gtk::WIN_POS_CENTER_ON_PARENT);
ArdourDialog::~ArdourDialog ()
{
- if (_splash_pushed) {
- Splash* spl = Splash::instance();
-
- if (spl) {
- spl->pop_front();
- }
- }
+ pop_splash ();
+ Keyboard::the_keyboard().focus_out_window (0, this);
WM::Manager::instance().remove (proxy);
}
-bool
-ArdourDialog::on_key_press_event (GdkEventKey* ev)
+void
+ArdourDialog::on_response (int response_id)
+{
+ pop_splash ();
+ hide ();
+ ARDOUR::GUIIdle ();
+ Gtk::Dialog::on_response (response_id);
+}
+
+void
+ArdourDialog::pop_splash ()
{
- if (!relay_key_press (ev, this)) {
- return Gtk::Window::on_key_press_event(ev);
+ if (_splash_pushed) {
+ Splash* spl = Splash::instance();
+
+ if (spl) {
+ spl->pop_front();
+ }
+ _splash_pushed = false;
}
- return true;
}
bool
-ArdourDialog::on_enter_notify_event (GdkEventCrossing *ev)
+ArdourDialog::on_focus_in_event (GdkEventFocus *ev)
{
- Keyboard::the_keyboard().enter_window (ev, this);
- return Dialog::on_enter_notify_event (ev);
+ Keyboard::the_keyboard().focus_in_window (ev, this);
+ return Dialog::on_focus_in_event (ev);
}
bool
-ArdourDialog::on_leave_notify_event (GdkEventCrossing *ev)
+ArdourDialog::on_focus_out_event (GdkEventFocus *ev)
{
- Keyboard::the_keyboard().leave_window (ev, this);
- return Dialog::on_leave_notify_event (ev);
+ if (!get_modal()) {
+ Keyboard::the_keyboard().focus_out_window (ev, this);
+ }
+ return Dialog::on_focus_out_event (ev);
}
void
if (spl && spl->is_visible()) {
spl->pop_back_for (*this);
- _splash_pushed = true;
+ _splash_pushed = true;
}
}
ArdourDialog::init ()
{
set_border_width (10);
-
+ add_events (Gdk::FOCUS_CHANGE_MASK);
set_type_hint (Gdk::WINDOW_TYPE_HINT_DIALOG);
Gtk::Window* parent = WM::Manager::instance().transient_parent();