13
0

fix indentation nightmare from 9559cf3947

This commit is contained in:
Paul Davis 2014-11-25 12:17:14 +02:00
parent 5101916a17
commit 97981e9007

View File

@ -1,19 +1,19 @@
/* /*
Copyright (C) 2014 Paul Davis Copyright (C) 2014 Paul Davis
This program is free software; you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or the Free Software Foundation; either version 2 of the License, or
(at your option) any later version. (at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
@ -31,103 +31,103 @@ FloatingTextEntry::FloatingTextEntry (const std::string& initial_contents)
: Gtk::Window (Gtk::WINDOW_POPUP) : Gtk::Window (Gtk::WINDOW_POPUP)
, entry_changed (false) , entry_changed (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);
if (!initial_contents.empty()) {
entry.set_text (initial_contents);
}
if (!initial_contents.empty()) { entry.show ();
entry.set_text (initial_contents); entry.signal_changed().connect (sigc::mem_fun (*this, &FloatingTextEntry::changed));
} entry.signal_activate().connect (sigc::mem_fun (*this, &FloatingTextEntry::activated));
entry.signal_key_press_event().connect (sigc::mem_fun (*this, &FloatingTextEntry::key_press));
entry.signal_button_press_event().connect (sigc::mem_fun (*this, &FloatingTextEntry::button_press));
PublicEditor::instance ().signal_focus_out_event().connect (sigc::mem_fun (*this, &FloatingTextEntry::entry_focus_out));
entry.show (); add (entry);
entry.signal_changed().connect (sigc::mem_fun (*this, &FloatingTextEntry::changed));
entry.signal_activate().connect (sigc::mem_fun (*this, &FloatingTextEntry::activated));
entry.signal_key_press_event().connect (sigc::mem_fun (*this, &FloatingTextEntry::key_press));
entry.signal_button_press_event().connect (sigc::mem_fun (*this, &FloatingTextEntry::button_press));
//PublicEditor::instance ().signal_focus_out_event().connect (sigc::mem_fun (*this, &FloatingTextEntry::entry_focus_out));
add (entry);
} }
void void
FloatingTextEntry::changed () FloatingTextEntry::changed ()
{ {
entry_changed = true; entry_changed = true;
} }
void void
FloatingTextEntry::on_realize () 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));
entry.add_modal_grab (); entry.add_modal_grab ();
} }
bool bool
FloatingTextEntry::entry_focus_out (GdkEventFocus* ev) FloatingTextEntry::entry_focus_out (GdkEventFocus* ev)
{ {
entry.remove_modal_grab (); entry.remove_modal_grab ();
if (entry_changed) { if (entry_changed) {
use_text (entry.get_text ()); use_text (entry.get_text ());
} }
delete_when_idle ( this); delete_when_idle ( this);
return false; return false;
} }
bool bool
FloatingTextEntry::button_press (GdkEventButton* ev) FloatingTextEntry::button_press (GdkEventButton* ev)
{ {
if (Gtkmm2ext::event_inside_widget_window (*this, (GdkEvent*) ev)) { if (Gtkmm2ext::event_inside_widget_window (*this, (GdkEvent*) ev)) {
return true; return true;
} }
/* Clicked outside widget window - edit is done */ /* Clicked outside widget window - edit is done */
entry.remove_modal_grab (); entry.remove_modal_grab ();
/* arrange re-propagation of the event once we go idle */ /* arrange re-propagation of the event once we go idle */
Glib::signal_idle().connect (sigc::bind_return (sigc::bind (sigc::ptr_fun (gtk_main_do_event), gdk_event_copy ((GdkEvent*) ev)), false)); Glib::signal_idle().connect (sigc::bind_return (sigc::bind (sigc::ptr_fun (gtk_main_do_event), gdk_event_copy ((GdkEvent*) ev)), false));
if (entry_changed) { if (entry_changed) {
use_text (entry.get_text ()); use_text (entry.get_text ());
} }
delete_when_idle ( this); delete_when_idle ( this);
return false; return false;
} }
void void
FloatingTextEntry::activated () FloatingTextEntry::activated ()
{ {
use_text (entry.get_text()); // EMIT SIGNAL use_text (entry.get_text()); // EMIT SIGNAL
delete_when_idle (this); delete_when_idle (this);
} }
bool bool
FloatingTextEntry::key_press (GdkEventKey* ev) FloatingTextEntry::key_press (GdkEventKey* ev)
{ {
switch (ev->keyval) { switch (ev->keyval) {
case GDK_Escape: case GDK_Escape:
delete_when_idle (this); delete_when_idle (this);
return true; return true;
break; break;
default: default:
break; break;
} }
return false; return false;
} }
void void
FloatingTextEntry::on_hide () FloatingTextEntry::on_hide ()
{ {
entry.remove_modal_grab (); entry.remove_modal_grab ();
/* No hide button is shown (no decoration on the window), /* No hide button is shown (no decoration on the window),
so being hidden is equivalent to the Escape key or any other so being hidden is equivalent to the Escape key or any other
method of cancelling the edit. method of cancelling the edit.
*/ */
delete_when_idle (this); delete_when_idle (this);
Gtk::Window::on_hide (); Gtk::Window::on_hide ();
} }