You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
60 lines
1.9 KiB
60 lines
1.9 KiB
From d8bf0d3f0af16e208b52084f19a9a1287acbcea0 Mon Sep 17 00:00:00 2001 |
|
From: Nils Philippsen <nils@redhat.com> |
|
Date: Fri, 2 Sep 2011 11:56:26 +0200 |
|
Subject: [PATCH] patch: preview-selection |
|
MIME-Version: 1.0 |
|
Content-Type: text/plain; charset=UTF-8 |
|
Content-Transfer-Encoding: 8bit |
|
|
|
Squashed commit of the following: |
|
|
|
commit e7c03a6de0c76256810b6340e0a954e88c3448e9 |
|
Author: Reinhard Fössmeier <info@ais-sanmarino.org> |
|
Date: Wed May 12 20:23:18 2010 +0200 |
|
|
|
fixed a problem in mouse event processing |
|
|
|
Fixed a problem in mouse event processing that interfered with selecting |
|
the scan rectangle in the preview window. |
|
--- |
|
src/xsane-preview.c | 9 ++++----- |
|
1 file changed, 4 insertions(+), 5 deletions(-) |
|
|
|
diff --git a/src/xsane-preview.c b/src/xsane-preview.c |
|
index f089dd1..264c775 100644 |
|
--- a/src/xsane-preview.c |
|
+++ b/src/xsane-preview.c |
|
@@ -80,7 +80,6 @@ |
|
#include "xsane-preview.h" |
|
#include "xsane-preferences.h" |
|
#include "xsane-gamma.h" |
|
-#include <gdk/gdkkeysyms.h> |
|
|
|
|
|
#ifndef PATH_MAX |
|
@@ -3023,9 +3022,9 @@ static gint preview_motion_event_handler(GtkWidget *window, GdkEvent *event, gpo |
|
preview_display_color_components(p, event->motion.x, event->motion.y); |
|
|
|
switch (((GdkEventMotion *)event)->state & |
|
- GDK_Num_Lock & GDK_Caps_Lock & GDK_Shift_Lock & GDK_Scroll_Lock) /* mask all Locks */ |
|
+ (GDK_BUTTON1_MASK | GDK_BUTTON2_MASK | GDK_BUTTON3_MASK)) /* only check for mouse buttons */ |
|
{ |
|
- case 256: /* left button */ |
|
+ case GDK_BUTTON1_MASK: /* left button */ |
|
|
|
DBG(DBG_info2, "left button\n"); |
|
|
|
@@ -3292,8 +3291,8 @@ static gint preview_motion_event_handler(GtkWidget *window, GdkEvent *event, gpo |
|
} |
|
break; |
|
|
|
- case 512: /* middle button */ |
|
- case 1024: /* right button */ |
|
+ case GDK_BUTTON2_MASK: /* middle button */ |
|
+ case GDK_BUTTON3_MASK: /* right button */ |
|
DBG(DBG_info2, "middle or right button\n"); |
|
|
|
if (p->selection_drag) |
|
-- |
|
1.7.11.4 |
|
|
|
|