Skip to content

Commit f02aba9

Browse files
committed
fix middle-drag scroll
gtk no longer adds the PRESS event by default
1 parent 656e3cf commit f02aba9

File tree

5 files changed

+22
-10
lines changed

5 files changed

+22
-10
lines changed

ChangeLog

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
started 8.3.1 on 19/5/16
22
- disable debug by default, thanks Benjamin
33
- configure changes to help win64
4+
- fix middle-drag in ws and image view
45

56
started 8.3.0 on 28/3/16
67
- move path search stuff into _convert from _magick

src/columnview.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1103,8 +1103,10 @@ columnview_init( Columnview *cview )
11031103
*/
11041104
cview->title = gtk_event_box_new();
11051105
gtk_widget_add_events( GTK_WIDGET( cview->title ),
1106-
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK |
1107-
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK );
1106+
GDK_POINTER_MOTION_MASK |
1107+
GDK_POINTER_MOTION_HINT_MASK |
1108+
GDK_BUTTON_PRESS_MASK |
1109+
GDK_BUTTON_RELEASE_MASK );
11081110
gtk_box_pack_start( GTK_BOX( cview->vbox ),
11091111
cview->title, FALSE, FALSE, 0 );
11101112
set_tooltip( cview->title, _( "Left-drag to move, left-double-click to "

src/iimageview.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -363,8 +363,10 @@ iimageview_init( iImageview *iimageview )
363363
/* Need these events in the enclosing workspaceview.
364364
*/
365365
gtk_widget_add_events( GTK_WIDGET( iimageview->id ),
366-
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK |
367-
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK );
366+
GDK_POINTER_MOTION_MASK |
367+
GDK_POINTER_MOTION_HINT_MASK |
368+
GDK_BUTTON_PRESS_MASK |
369+
GDK_BUTTON_RELEASE_MASK );
368370

369371
iimageview->label = gtk_label_new( "" );
370372
gtk_misc_set_alignment( GTK_MISC( iimageview->label ), 0, 0.5 );

src/imagepresent.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1521,9 +1521,12 @@ imagepresent_init( Imagepresent *ip )
15211521
*/
15221522
gtk_widget_add_events( GTK_WIDGET( ip->id ),
15231523
GDK_KEY_PRESS_MASK |
1524-
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK |
1525-
GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK |
1526-
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK );
1524+
GDK_POINTER_MOTION_MASK |
1525+
GDK_POINTER_MOTION_HINT_MASK |
1526+
GDK_ENTER_NOTIFY_MASK |
1527+
GDK_LEAVE_NOTIFY_MASK |
1528+
GDK_BUTTON_PRESS_MASK |
1529+
GDK_BUTTON_RELEASE_MASK );
15271530
gtk_signal_connect_after( GTK_OBJECT( ip->id ), "event",
15281531
GTK_SIGNAL_FUNC( imagepresent_event_cb ), ip );
15291532
gtk_signal_connect( GTK_OBJECT( ip ), "key_press_event",

src/workspaceview.c

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1121,8 +1121,10 @@ workspaceview_init( Workspaceview *wview )
11211121
*/
11221122
wview->fixed = gtk_fixed_new();
11231123
gtk_widget_add_events( GTK_WIDGET( wview->fixed ),
1124-
GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK |
1125-
GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK );
1124+
GDK_POINTER_MOTION_MASK |
1125+
GDK_POINTER_MOTION_HINT_MASK |
1126+
GDK_BUTTON_PRESS_MASK |
1127+
GDK_BUTTON_RELEASE_MASK );
11261128
gtk_fixed_set_has_window( GTK_FIXED( wview->fixed ), TRUE );
11271129
wview->window = gtk_scrolled_window_new( NULL, NULL );
11281130
gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW( wview->window ),
@@ -1139,7 +1141,9 @@ workspaceview_init( Workspaceview *wview )
11391141
gtk_signal_connect( GTK_OBJECT( wview->fixed ), "event",
11401142
GTK_SIGNAL_FUNC( workspaceview_fixed_event_cb ), wview );
11411143
gtk_widget_add_events( GTK_WIDGET( wview->fixed ),
1142-
GDK_BUTTON_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK |
1144+
GDK_BUTTON_MOTION_MASK |
1145+
GDK_POINTER_MOTION_HINT_MASK |
1146+
GDK_BUTTON_PRESS_MASK |
11431147
GDK_BUTTON_RELEASE_MASK );
11441148

11451149
hadj = gtk_scrolled_window_get_hadjustment(

0 commit comments

Comments
 (0)