Bug fix: Re-size images in GTK3

[geeqie.git] / src / img-view.c

diff --git a/src/img-view.c b/src/img-view.c
index f4768dd..00aff7e 100644 (file)
--- a/src/img-view.c
+++ b/src/img-view.c
@@ -421,13 +421,13 @@ static gboolean view_window_key_press_cb(GtkWidget *widget, GdkEventKey *event,
                switch (event->keyval)
                        {
                        case 'R': case 'r':
-                               image_alter_orientation(imd, ALTER_ROTATE_180);
+                               image_alter_orientation(imd, imd->image_fd, ALTER_ROTATE_180);
                                break;
                        case 'M': case 'm':
-                               image_alter_orientation(imd, ALTER_MIRROR);
+                               image_alter_orientation(imd, imd->image_fd, ALTER_MIRROR);
                                break;
                        case 'F': case 'f':
-                               image_alter_orientation(imd, ALTER_FLIP);
+                               image_alter_orientation(imd, imd->image_fd, ALTER_FLIP);
                                break;
                        case 'G': case 'g':
                                image_set_desaturate(imd, !image_get_desaturate(imd));
@@ -531,10 +531,10 @@ static gboolean view_window_key_press_cb(GtkWidget *widget, GdkEventKey *event,
                                view_overlay_toggle(vw);
                                break;
                        case ']':
-                               image_alter_orientation(imd, ALTER_ROTATE_90);
+                               image_alter_orientation(imd, imd->image_fd, ALTER_ROTATE_90);
                                break;
                        case '[':
-                               image_alter_orientation(imd, ALTER_ROTATE_90_CC);
+                               image_alter_orientation(imd, imd->image_fd, ALTER_ROTATE_90_CC);
                                break;
                        case GDK_KEY_Delete: case GDK_KEY_KP_Delete:
                                if (options->file_ops.enable_delete_key)
@@ -600,7 +600,8 @@ static void scroll_cb(ImageWindow *imd, GdkEventScroll *event, gpointer data)
 {
        ViewWindow *vw = data;
 
-       if (event->state & GDK_CONTROL_MASK)
+       if ((event->state & GDK_CONTROL_MASK) ||
+                               (imd->mouse_wheel_mode && !options->image_lm_click_nav))
                {
                switch (event->direction)
                        {
@@ -905,7 +906,9 @@ static ViewWindow *real_view_window_new(FileData *fd, GList *list, CollectionDat
        req_size.height = h;
        gtk_widget_size_allocate(GTK_WIDGET(vw->window), &req_size);
 
+#if !GTK_CHECK_VERSION(3,0,0)
        gtk_widget_set_size_request(vw->imd->pr, w, h);
+#endif
 
        gtk_widget_show(vw->window);
 
@@ -1081,7 +1084,7 @@ static void view_alter_cb(GtkWidget *widget, gpointer data)
        type = GPOINTER_TO_INT(data);
 
        if (!vw) return;
-       image_alter_orientation(vw->imd, type);
+       image_alter_orientation(vw->imd, vw->imd->image_fd, type);
 }
 
 static void view_wallpaper_cb(GtkWidget *widget, gpointer data)