diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2012-10-04 08:06:18 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2012-10-04 08:06:18 +0000 |
| commit | fec1be463b3950772422da45fe4655de40c864e7 (patch) | |
| tree | 2eeef78cb15a7fba9453cfc9c12067c0331818d5 /src/widgets/eek-preview.cpp | |
| parent | update based on patch 'changes_2012_09_27b.patch' (diff) | |
| parent | extensions. Extrude. allow selection of multiple objects (Bug 1055155) (diff) | |
| download | inkscape-fec1be463b3950772422da45fe4655de40c864e7.tar.gz inkscape-fec1be463b3950772422da45fe4655de40c864e7.zip | |
merge from trunk (r11734)
(bzr r11668.1.22)
Diffstat (limited to 'src/widgets/eek-preview.cpp')
| -rw-r--r-- | src/widgets/eek-preview.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/widgets/eek-preview.cpp b/src/widgets/eek-preview.cpp index a0bc1ef15..e0c5d9eac 100644 --- a/src/widgets/eek-preview.cpp +++ b/src/widgets/eek-preview.cpp @@ -550,7 +550,8 @@ static gboolean eek_preview_button_press_cb( GtkWidget* widget, GdkEventButton* gtk_widget_grab_focus(widget); } - if ( event->button == PRIME_BUTTON_MAGIC_NUMBER ) { + if ( event->button == PRIME_BUTTON_MAGIC_NUMBER || + event->button == 2 ) { preview->_hot = TRUE; if ( preview->_within ) { gtk_widget_set_state( widget, GTK_STATE_ACTIVE ); @@ -567,8 +568,10 @@ static gboolean eek_preview_button_release_cb( GtkWidget* widget, GdkEventButton EekPreview* preview = EEK_PREVIEW(widget); preview->_hot = FALSE; gtk_widget_set_state( widget, GTK_STATE_NORMAL ); - if ( preview->_within && event->button == PRIME_BUTTON_MAGIC_NUMBER ) { - gboolean isAlt = (event->state & GDK_SHIFT_MASK) == GDK_SHIFT_MASK; + if ( preview->_within && + (event->button == PRIME_BUTTON_MAGIC_NUMBER || event->button == 2)) { + gboolean isAlt = ( ((event->state & GDK_SHIFT_MASK) == GDK_SHIFT_MASK) || + (event->button == 2)); if ( isAlt ) { g_signal_emit( widget, eek_preview_signals[ALTCLICKED_SIGNAL], 0, 2 ); |