Use conf.fatal for fatal configuration errors

[ardour.git] / gtk2_ardour / floating_text_entry.cc

diff --git a/gtk2_ardour/floating_text_entry.cc b/gtk2_ardour/floating_text_entry.cc
index 3dc74fe796bf1ad637f96ee7b379b91da5d16e1f..b31e83184b424104f2cb6bd4f5e8f5f9a9b16ec8 100644 (file)
--- a/gtk2_ardour/floating_text_entry.cc
+++ b/gtk2_ardour/floating_text_entry.cc
@@ -1,21 +1,21 @@
 /*
-  Copyright (C) 2014 Paul Davis
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-*/
+ * Copyright (C) 2014-2016 Paul Davis <paul@linuxaudiosystems.com>
+ * Copyright (C) 2015-2017 Robin Gareus <robin@gareus.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
 
 #include "pbd/stacktrace.h"
 #include "public_editor.h"
@@ -28,13 +28,14 @@
 #include "pbd/i18n.h"
 
 FloatingTextEntry::FloatingTextEntry (Gtk::Window* parent, const std::string& initial_contents)
-       : Gtk::Window (Gtk::WINDOW_POPUP)
-        , entry_changed (false)
-       , by_popup_menu (false)
+       : Gtk::Window ()
+       , entry_changed (false)
 {
        //set_name (X_("FloatingTextEntry"));
        set_position (Gtk::WIN_POS_MOUSE);
        set_border_width (0);
+       set_type_hint(Gdk::WINDOW_TYPE_HINT_POPUP_MENU);
+       set_resizable (false);
 
        if (!initial_contents.empty()) {
                entry.set_text (initial_contents);
@@ -46,23 +47,16 @@ FloatingTextEntry::FloatingTextEntry (Gtk::Window* parent, const std::string& in
        _connections.push_back (entry.signal_key_press_event().connect (sigc::mem_fun (*this, &FloatingTextEntry::key_press), false));
        _connections.push_back (entry.signal_key_release_event().connect (sigc::mem_fun (*this, &FloatingTextEntry::key_release), false));
        _connections.push_back (entry.signal_button_press_event().connect (sigc::mem_fun (*this, &FloatingTextEntry::button_press)));
-       _connections.push_back (entry.signal_populate_popup().connect (sigc::mem_fun (*this, &FloatingTextEntry::populate_popup)));
 
        entry.select_region (0, -1);
 
        if (parent) {
-               _connections.push_back (parent->signal_focus_out_event().connect (sigc::mem_fun (*this, &FloatingTextEntry::entry_focus_out)));
+               set_transient_for (*parent);
        }
 
        add (entry);
 }
 
-void
-FloatingTextEntry::populate_popup (Gtk::Menu *)
-{
-       by_popup_menu = true;
-}
-
 void
 FloatingTextEntry::changed ()
 {
@@ -74,17 +68,13 @@ FloatingTextEntry::on_realize ()
 {
        Gtk::Window::on_realize ();
        get_window()->set_decorations (Gdk::WMDecoration (0));
+       set_keep_above (true);
        entry.add_modal_grab ();
 }
 
 bool
 FloatingTextEntry::entry_focus_out (GdkEventFocus* ev)
 {
-       if (by_popup_menu) {
-               by_popup_menu = false;
-               return false;
-       }
-
        entry.remove_modal_grab ();
        if (entry_changed) {
                disconect_signals ();
@@ -199,6 +189,7 @@ FloatingTextEntry::disconect_signals ()
        for (std::list<sigc::connection>::iterator i = _connections.begin(); i != _connections.end(); ++i) {
                i->disconnect ();
        }
+        _connections.clear ();
        /* the entry is floating on-top, emitting use_text()
         * may result in another dialog being shown (cannot rename track)
         * which would