smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-07 07:14:56 +01:00
Code Issues Projects Releases Wiki Activity

Fix edit-cursor in TextEntry

Browse source 
Gtk::WINDOW_POPUP cannot be used for windows that require focus.
A gtk-entry without focus does not show an edit-cursor.
This commit is contained in:
Robin Gareus 2017-07-29 02:05:28 +02:00
parent b5e0b5b09f
commit 06c37b7c3f
2 changed files with 6 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

20
gtk2_ardour/floating_text_entry.cc
View file

@ -28,13 +28,14 @@
#include "pbd/i18n.h" #include "pbd/i18n.h"
FloatingTextEntry::FloatingTextEntry (Gtk::Window* parent, const std::string& initial_contents) FloatingTextEntry::FloatingTextEntry (Gtk::Window* parent, const std::string& initial_contents)
: Gtk::Window (Gtk::WINDOW_POPUP) : Gtk::Window ()
, entry_changed (false) , entry_changed (false)
, by_popup_menu (false)
{ {
//set_name (X_("FloatingTextEntry")); //set_name (X_("FloatingTextEntry"));
set_position (Gtk::WIN_POS_MOUSE); set_position (Gtk::WIN_POS_MOUSE);
set_border_width (0); set_border_width (0);
set_type_hint(Gdk::WINDOW_TYPE_HINT_POPUP_MENU);
set_resizable (false);
if (!initial_contents.empty()) { if (!initial_contents.empty()) {
entry.set_text (initial_contents); 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_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_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_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); entry.select_region (0, -1);
if (parent) { 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); add (entry);
} }
void
FloatingTextEntry::populate_popup (Gtk::Menu *)
{
by_popup_menu = true;
}
void void
FloatingTextEntry::changed () FloatingTextEntry::changed ()
{ {
@ -74,17 +68,13 @@ FloatingTextEntry::on_realize ()
{ {
Gtk::Window::on_realize (); Gtk::Window::on_realize ();
get_window()->set_decorations (Gdk::WMDecoration (0)); get_window()->set_decorations (Gdk::WMDecoration (0));
set_keep_above (true);
entry.add_modal_grab (); entry.add_modal_grab ();
} }
bool bool
FloatingTextEntry::entry_focus_out (GdkEventFocus* ev) FloatingTextEntry::entry_focus_out (GdkEventFocus* ev)
{ {
if (by_popup_menu) {
by_popup_menu = false;
return false;
}
entry.remove_modal_grab (); entry.remove_modal_grab ();
if (entry_changed) { if (entry_changed) {
disconect_signals (); disconect_signals ();

2
gtk2_ardour/floating_text_entry.h
View file

@ -39,7 +39,6 @@ public:
private: private:
Gtk::Entry entry; Gtk::Entry entry;
bool entry_changed; bool entry_changed;
bool by_popup_menu;
/* handlers for Entry events */ /* handlers for Entry events */
bool entry_focus_out (GdkEventFocus*); bool entry_focus_out (GdkEventFocus*);
@ -48,7 +47,6 @@ private:
void activated (); void activated ();
bool button_press (GdkEventButton*); bool button_press (GdkEventButton*);
void changed (); void changed ();
void populate_popup (Gtk::Menu*);
void idle_delete_self (); void idle_delete_self ();
void disconect_signals (); void disconect_signals ();