aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcorvid <corvid@lavabit.com>2011-02-18 02:06:35 +0000
committercorvid <corvid@lavabit.com>2011-02-18 02:06:35 +0000
commit151ad1018b0c1481474617ca96d393d95dd8a07e (patch)
treec0e776ad96dabe51888be6d1a8d6ffca62e51a0f
parentdc7a94459dd07aa469ad60de677a5bce48487ed4 (diff)
findbar activation
the Fl_Input would eat the shift-enter keypress, meaning that the Previous button never got its shortcut.
-rw-r--r--src/findbar.cc16
-rw-r--r--src/findbar.hh1
2 files changed, 1 insertions, 16 deletions
diff --git a/src/findbar.cc b/src/findbar.cc
index 5dd45bd6..2bda5452 100644
--- a/src/findbar.cc
+++ b/src/findbar.cc
@@ -82,19 +82,6 @@ void Findbar::searchBackwards_cb(Fl_Widget *, void *vfb)
}
/*
- * Find next occurrence of input key
- */
-void Findbar::search_cb2(Fl_Widget *widget, void *vfb)
-{
- /*
- * Somehow fltk even regards the first loss of focus for the
- * window as a WHEN_ENTER_KEY_ALWAYS event.
- */
- if (Fl::event_key() == FL_Enter)
- search_cb(widget, vfb);
-}
-
-/*
* Hide the search bar
*/
void Findbar::hide_cb(Fl_Widget *, void *vfb)
@@ -133,8 +120,7 @@ Findbar::Findbar(int width, int height) :
x += input_width + gap;
resizable(i);
i->color(206);
- i->when(FL_WHEN_ENTER_KEY_ALWAYS);
- i->callback(search_cb2, this);
+ i->when(FL_WHEN_NEVER);
add(i);
next_btn = new Fl_Button(x, border, button_width, height, "Next");
diff --git a/src/findbar.hh b/src/findbar.hh
index 77d4a685..11986407 100644
--- a/src/findbar.hh
+++ b/src/findbar.hh
@@ -20,7 +20,6 @@ class Findbar : public Fl_Group {
static void search_cb (Fl_Widget *, void *);
static void searchBackwards_cb (Fl_Widget *, void *);
- static void search_cb2 (Fl_Widget *, void *);
static void hide_cb (Fl_Widget *, void *);
public: