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