[gedit: 8/14] ViewFrame: use GDK_EVENT_PROPAGATE and GDK_EVENT_STOP
- From: Sébastien Wilmet <swilmet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gedit: 8/14] ViewFrame: use GDK_EVENT_PROPAGATE and GDK_EVENT_STOP
- Date: Thu, 8 Aug 2013 15:30:53 +0000 (UTC)
commit 64c7d253e17bf0142791f1fb32351c01f61309c9
Author: Sébastien Wilmet <swilmet gnome org>
Date: Wed Aug 7 20:36:04 2013 +0200
ViewFrame: use GDK_EVENT_PROPAGATE and GDK_EVENT_STOP
This also fixes a bug with the scrolling. Ctrl+scroll doesn't work, but
at least the buffer is scrolled.
gedit/gedit-view-frame.c | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
---
diff --git a/gedit/gedit-view-frame.c b/gedit/gedit-view-frame.c
index 7be6bb5..5fb44ba 100644
--- a/gedit/gedit-view-frame.c
+++ b/gedit/gedit-view-frame.c
@@ -441,7 +441,7 @@ search_widget_scroll_event (GtkWidget *widget,
{
if (frame->priv->search_mode == GOTO_LINE)
{
- return FALSE;
+ return GDK_EVENT_PROPAGATE;
}
if (event->state & GDK_CONTROL_MASK)
@@ -449,14 +449,16 @@ search_widget_scroll_event (GtkWidget *widget,
if (event->direction == GDK_SCROLL_UP)
{
search_again (frame, TRUE);
+ return GDK_EVENT_STOP;
}
else if (event->direction == GDK_SCROLL_DOWN)
{
search_again (frame, FALSE);
+ return GDK_EVENT_STOP;
}
}
- return TRUE;
+ return GDK_EVENT_PROPAGATE;
}
static gboolean
@@ -470,7 +472,7 @@ search_widget_key_press_event (GtkWidget *widget,
if (event->keyval == GDK_KEY_Tab)
{
hide_search_widget (frame, FALSE);
- return TRUE;
+ return GDK_EVENT_STOP;
}
/* Close window and cancel the search */
@@ -493,12 +495,12 @@ search_widget_key_press_event (GtkWidget *widget,
}
hide_search_widget (frame, TRUE);
- return TRUE;
+ return GDK_EVENT_STOP;
}
if (frame->priv->search_mode == GOTO_LINE)
{
- return FALSE;
+ return GDK_EVENT_PROPAGATE;
}
/* SEARCH mode */
@@ -507,31 +509,31 @@ search_widget_key_press_event (GtkWidget *widget,
if (event->keyval == GDK_KEY_Up || event->keyval == GDK_KEY_KP_Up)
{
search_again (frame, TRUE);
- return TRUE;
+ return GDK_EVENT_STOP;
}
if (((event->state & modifiers) == (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) &&
(event->keyval == GDK_KEY_g || event->keyval == GDK_KEY_G))
{
search_again (frame, TRUE);
- return TRUE;
+ return GDK_EVENT_STOP;
}
/* select next matching iter */
if (event->keyval == GDK_KEY_Down || event->keyval == GDK_KEY_KP_Down)
{
search_again (frame, FALSE);
- return TRUE;
+ return GDK_EVENT_STOP;
}
if (((event->state & modifiers) == GDK_CONTROL_MASK) &&
(event->keyval == GDK_KEY_g || event->keyval == GDK_KEY_G))
{
search_again (frame, FALSE);
- return TRUE;
+ return GDK_EVENT_STOP;
}
- return FALSE;
+ return GDK_EVENT_PROPAGATE;
}
static void
@@ -1015,7 +1017,7 @@ search_entry_focus_out_event (GtkWidget *widget,
GeditViewFrame *frame)
{
hide_search_widget (frame, FALSE);
- return FALSE;
+ return GDK_EVENT_PROPAGATE;
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]