Fix #786: Image in fixed size window smaller than X11 desktop sometimes gets wrong...

https://github.com/BestImageViewer/geeqie/issues/786

Undo Temporary Fix #133: switching between images causes window to keep
shrinking

diff --git a/src/image.c b/src/image.c
index 079b7ae..177d378 100644 (file)
--- a/src/image.c
+++ b/src/image.c
@@ -1224,7 +1224,7 @@ void image_attach_window(ImageWindow *imd, GtkWidget *window,
 
        lw = layout_find_by_image(imd);
 
-       if (!(options->image.fit_window_to_image && lw && lw->options.tools_float)) window = NULL;
+       if (!(options->image.fit_window_to_image && lw && (lw->options.tools_float || lw->options.tools_hidden))) window = NULL;
 
        pixbuf_renderer_set_parent((PixbufRenderer *)imd->pr, (GtkWindow *)window);
 

diff --git a/src/pixbuf-renderer.c b/src/pixbuf-renderer.c
index 597a0ed..d8d5219 100644 (file)
--- a/src/pixbuf-renderer.c
+++ b/src/pixbuf-renderer.c
@@ -1772,10 +1772,10 @@ static void pr_zoom_sync(PixbufRenderer *pr, gdouble zoom,
                }
 
        if (force) clamp_flags |= PR_ZOOM_INVALIDATE;
-       (void) pr_parent_window_resize(pr, pr->width, pr->height);
        if (!pr_zoom_clamp(pr, zoom, clamp_flags)) return;
 
        (void) pr_size_clamp(pr);
+       (void) pr_parent_window_resize(pr, pr->width, pr->height);
 
        if (force && new)
                {