[gthumb] [image_viewer] removed the custom mouse_wheel_scroll event
- From: Paolo Bacchilega <paobac src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gthumb] [image_viewer] removed the custom mouse_wheel_scroll event
- Date: Sat, 30 Jan 2010 09:29:56 +0000 (UTC)
commit 4823d8664bd4e061dd252c516af9a40a20dcc1fa
Author: Paolo Bacchilega <paobac src gnome org>
Date: Sat Jan 30 09:58:56 2010 +0100
[image_viewer] removed the custom mouse_wheel_scroll event
no need to create a custom event, just use the gtk+ scroll_event
[bug #608463]
extensions/image_viewer/gth-image-viewer-page.c | 30 +++++++++++-----------
gthumb/gth-browser.c | 6 ++++
gthumb/gth-image-viewer.c | 21 +--------------
gthumb/gth-image-viewer.h | 2 -
4 files changed, 23 insertions(+), 36 deletions(-)
---
diff --git a/extensions/image_viewer/gth-image-viewer-page.c b/extensions/image_viewer/gth-image-viewer-page.c
index 39338ce..5f2da34 100644
--- a/extensions/image_viewer/gth-image-viewer-page.c
+++ b/extensions/image_viewer/gth-image-viewer-page.c
@@ -199,8 +199,8 @@ static GtkActionEntry image_viewer_action_entries[] = {
static void
-image_ready_cb (GtkWidget *widget,
- GthImageViewerPage *self)
+viewer_image_ready_cb (GtkWidget *widget,
+ GthImageViewerPage *self)
{
gth_image_history_clear (self->priv->history);
gth_image_history_add_image (self->priv->history,
@@ -211,8 +211,8 @@ image_ready_cb (GtkWidget *widget,
static gboolean
-zoom_changed_cb (GtkWidget *widget,
- GthImageViewerPage *self)
+viewer_zoom_changed_cb (GtkWidget *widget,
+ GthImageViewerPage *self)
{
double zoom;
char *text;
@@ -230,18 +230,18 @@ zoom_changed_cb (GtkWidget *widget,
static gboolean
-image_button_press_cb (GtkWidget *widget,
- GdkEventButton *event,
- GthImageViewerPage *self)
+viewer_button_press_event_cb (GtkWidget *widget,
+ GdkEventButton *event,
+ GthImageViewerPage *self)
{
return gth_browser_viewer_button_press_cb (self->priv->browser, event);
}
static gboolean
-mouse_whell_scroll_cb (GtkWidget *widget,
- GdkEventScroll *event,
- GthImageViewerPage *self)
+viewer_scroll_event_cb (GtkWidget *widget,
+ GdkEventScroll *event,
+ GthImageViewerPage *self)
{
return gth_browser_viewer_scroll_event_cb (self->priv->browser, event);
}
@@ -413,19 +413,19 @@ gth_image_viewer_page_real_activate (GthViewerPage *base,
g_signal_connect (G_OBJECT (self->priv->viewer),
"image_ready",
- G_CALLBACK (image_ready_cb),
+ G_CALLBACK (viewer_image_ready_cb),
self);
g_signal_connect (G_OBJECT (self->priv->viewer),
"zoom_changed",
- G_CALLBACK (zoom_changed_cb),
+ G_CALLBACK (viewer_zoom_changed_cb),
self);
g_signal_connect_after (G_OBJECT (self->priv->viewer),
"button_press_event",
- G_CALLBACK (image_button_press_cb),
+ G_CALLBACK (viewer_button_press_event_cb),
self);
g_signal_connect_after (G_OBJECT (self->priv->viewer),
- "mouse_wheel_scroll",
- G_CALLBACK (mouse_whell_scroll_cb),
+ "scroll_event",
+ G_CALLBACK (viewer_scroll_event_cb),
self);
g_signal_connect (G_OBJECT (self->priv->viewer),
"key_press_event",
diff --git a/gthumb/gth-browser.c b/gthumb/gth-browser.c
index 45ea0da..8a6b617 100644
--- a/gthumb/gth-browser.c
+++ b/gthumb/gth-browser.c
@@ -3996,6 +3996,8 @@ gboolean
gth_browser_viewer_button_press_cb (GthBrowser *browser,
GdkEventButton *event)
{
+ g_return_val_if_fail (event != NULL, FALSE);
+
if (event->button == 3) {
gth_browser_file_menu_popup (browser, event);
return TRUE;
@@ -4009,6 +4011,8 @@ gboolean
gth_browser_viewer_scroll_event_cb (GthBrowser *browser,
GdkEventScroll *event)
{
+ g_return_val_if_fail (event != NULL, FALSE);
+
if (event->state & GDK_SHIFT_MASK)
return FALSE;
@@ -4028,6 +4032,8 @@ gboolean
gth_browser_viewer_key_press_cb (GthBrowser *browser,
GdkEventKey *event)
{
+ g_return_val_if_fail (event != NULL, FALSE);
+
switch (gdk_keyval_to_lower (event->keyval)) {
case GDK_Page_Up:
case GDK_BackSpace:
diff --git a/gthumb/gth-image-viewer.c b/gthumb/gth-image-viewer.c
index 66cb97b..8624913 100644
--- a/gthumb/gth-image-viewer.c
+++ b/gthumb/gth-image-viewer.c
@@ -58,7 +58,6 @@ enum {
ZOOM_CHANGED,
SIZE_CHANGED,
REPAINTED,
- MOUSE_WHEEL_SCROLL,
SCROLL,
LAST_SIGNAL
};
@@ -1167,13 +1166,8 @@ gth_image_viewer_scroll_event (GtkWidget *widget,
}
}
- if (event->direction == GDK_SCROLL_UP || event->direction == GDK_SCROLL_DOWN) {
- g_signal_emit (G_OBJECT (viewer),
- gth_image_viewer_signals[MOUSE_WHEEL_SCROLL],
- 0,
- event);
- return TRUE;
- }
+ if (event->direction == GDK_SCROLL_UP || event->direction == GDK_SCROLL_DOWN)
+ return FALSE;
adj = viewer->hadj;
@@ -1458,17 +1452,6 @@ gth_image_viewer_class_init (GthImageViewerClass *class)
g_cclosure_marshal_VOID__VOID,
G_TYPE_NONE,
0);
- gth_image_viewer_signals[MOUSE_WHEEL_SCROLL] =
- g_signal_new ("mouse_wheel_scroll",
- G_TYPE_FROM_CLASS (class),
- G_SIGNAL_RUN_LAST,
- G_STRUCT_OFFSET (GthImageViewerClass, mouse_wheel_scroll),
- NULL, NULL,
- g_cclosure_marshal_VOID__POINTER,
- G_TYPE_NONE,
- 1,
- GDK_TYPE_SCROLL_DIRECTION);
-
class->set_scroll_adjustments = set_scroll_adjustments;
widget_class->set_scroll_adjustments_signal =
g_signal_new ("set_scroll_adjustments",
diff --git a/gthumb/gth-image-viewer.h b/gthumb/gth-image-viewer.h
index c9dfef1..338ea4c 100644
--- a/gthumb/gth-image-viewer.h
+++ b/gthumb/gth-image-viewer.h
@@ -134,8 +134,6 @@ struct _GthImageViewerClass
GtkAdjustment *hadj,
GtkAdjustment *vadj);
void (* repainted) (GthImageViewer *viewer);
- void (* mouse_wheel_scroll) (GthImageViewer *viewer,
- GdkEventScroll *event);
/* -- Key binding signals -- */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]