projects / packages / xsane.git / blame
| Commit | Line | Data |
|---|---|---|
| 94120488 ER |
1 | # from Fedora |
| 2 | # https://bugzilla.redhat.com/show_bug.cgi?id=624190 | |
| 3 | # fix from: https://bugs.launchpad.net/ubuntu/+source/xsane/+bug/370818 | |
| 4 | # submitted to upstream (Oliver Rauch) via email, 2011-06-01 | |
| 5 | ||
| 12d07cfb AM |
6 | From d8bf0d3f0af16e208b52084f19a9a1287acbcea0 Mon Sep 17 00:00:00 2001 |
| 7 | From: Nils Philippsen <nils@redhat.com> | |
| 8 | Date: Fri, 2 Sep 2011 11:56:26 +0200 | |
| 9 | Subject: [PATCH] patch: preview-selection | |
| 10 | MIME-Version: 1.0 | |
| 11 | Content-Type: text/plain; charset=UTF-8 | |
| 12 | Content-Transfer-Encoding: 8bit | |
| 13 | ||
| 14 | Squashed commit of the following: | |
| 15 | ||
| 16 | commit e7c03a6de0c76256810b6340e0a954e88c3448e9 | |
| 17 | Author: Reinhard Fössmeier <info@ais-sanmarino.org> | |
| 18 | Date: Wed May 12 20:23:18 2010 +0200 | |
| 19 | ||
| 20 | fixed a problem in mouse event processing | |
| 21 | ||
| 22 | Fixed a problem in mouse event processing that interfered with selecting | |
| 23 | the scan rectangle in the preview window. | |
| 24 | --- | |
| 25 | src/xsane-preview.c | 9 ++++----- | |
| 26 | 1 file changed, 4 insertions(+), 5 deletions(-) | |
| 27 | ||
| 28 | diff --git a/src/xsane-preview.c b/src/xsane-preview.c | |
| 29 | index f089dd1..264c775 100644 | |
| 30 | --- a/src/xsane-preview.c | |
| 31 | +++ b/src/xsane-preview.c | |
| 32 | @@ -80,7 +80,6 @@ | |
| 33 | #include "xsane-preview.h" | |
| 34 | #include "xsane-preferences.h" | |
| 35 | #include "xsane-gamma.h" | |
| 36 | -#include <gdk/gdkkeysyms.h> | |
| 37 | ||
| 38 | ||
| 39 | #ifndef PATH_MAX | |
| 40 | @@ -3023,9 +3022,9 @@ static gint preview_motion_event_handler(GtkWidget *window, GdkEvent *event, gpo | |
| 41 | preview_display_color_components(p, event->motion.x, event->motion.y); | |
| 42 | ||
| 43 | switch (((GdkEventMotion *)event)->state & | |
| 44 | - GDK_Num_Lock & GDK_Caps_Lock & GDK_Shift_Lock & GDK_Scroll_Lock) /* mask all Locks */ | |
| 45 | + (GDK_BUTTON1_MASK | GDK_BUTTON2_MASK | GDK_BUTTON3_MASK)) /* only check for mouse buttons */ | |
| 46 | { | |
| 47 | - case 256: /* left button */ | |
| 48 | + case GDK_BUTTON1_MASK: /* left button */ | |
| 49 | ||
| 50 | DBG(DBG_info2, "left button\n"); | |
| 51 | ||
| 52 | @@ -3292,8 +3291,8 @@ static gint preview_motion_event_handler(GtkWidget *window, GdkEvent *event, gpo | |
| 53 | } | |
| 54 | break; | |
| 55 | ||
| 56 | - case 512: /* middle button */ | |
| 57 | - case 1024: /* right button */ | |
| 58 | + case GDK_BUTTON2_MASK: /* middle button */ | |
| 59 | + case GDK_BUTTON3_MASK: /* right button */ | |
| 60 | DBG(DBG_info2, "middle or right button\n"); | |
| 61 | ||
| 62 | if (p->selection_drag) | |
| 63 | -- | |
| 64 | 1.7.11.4 | |
| 65 |