projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove internal edit mode and add "content" tool.
[ardour.git]
/
gtk2_ardour
/
ardour_window.cc
diff --git
a/gtk2_ardour/ardour_window.cc
b/gtk2_ardour/ardour_window.cc
index f16032dc74381e059934080c67c7699f34e6f7d3..6b325aca8534325d9f73fb96c52fdeb53e6a937d 100644
(file)
--- a/
gtk2_ardour/ardour_window.cc
+++ b/
gtk2_ardour/ardour_window.cc
@@
-25,10
+25,12
@@
#include "ardour_window.h"
#include "ardour_ui.h"
#include "keyboard.h"
#include "ardour_window.h"
#include "ardour_ui.h"
#include "keyboard.h"
+#include "utils.h"
using namespace std;
using namespace Gtk;
using namespace Gtkmm2ext;
using namespace std;
using namespace Gtk;
using namespace Gtkmm2ext;
+using namespace ARDOUR_UI_UTILS;
ArdourWindow::ArdourWindow (string title)
: Window ()
ArdourWindow::ArdourWindow (string title)
: Window ()
@@
-50,6
+52,13
@@
ArdourWindow::ArdourWindow (Gtk::Window& parent, string /*title*/)
ArdourWindow::~ArdourWindow ()
{
ArdourWindow::~ArdourWindow ()
{
+ WM::Manager::instance().remove (proxy);
+}
+
+bool
+ArdourWindow::on_key_press_event (GdkEventKey* ev)
+{
+ return relay_key_press (ev, this);
}
bool
}
bool
@@
-73,6
+82,12
@@
ArdourWindow::on_unmap ()
Window::on_unmap ();
}
Window::on_unmap ();
}
+bool
+ArdourWindow::on_delete_event (GdkEventAny*)
+{
+ return false;
+}
+
void
ArdourWindow::init ()
{
void
ArdourWindow::init ()
{
@@
-88,8
+103,21
@@
ArdourWindow::init ()
vice versa.
*/
vice versa.
*/
- set_type_hint (Gdk::WINDOW_TYPE_HINT_UTILITY);
+ if (ARDOUR_UI::instance()->config()->get_all_floating_windows_are_dialogs()) {
+ set_type_hint (Gdk::WINDOW_TYPE_HINT_DIALOG);
+ } else {
+ set_type_hint (Gdk::WINDOW_TYPE_HINT_UTILITY);
+ }
+ Gtk::Window* parent = WM::Manager::instance().transient_parent();
+
+ if (parent) {
+ set_transient_for (*parent);
+ }
+
ARDOUR_UI::CloseAllDialogs.connect (sigc::mem_fun (*this, &ArdourWindow::hide));
ARDOUR_UI::CloseAllDialogs.connect (sigc::mem_fun (*this, &ArdourWindow::hide));
+
+ proxy = new WM::ProxyTemporary (get_title(), this);
+ WM::Manager::instance().register_window (proxy);
}
}