File 5398b971-fix-tiny-window-when-resetting-zoom-fa... of Package virt-viewer

Overview Repositories Revisions Requests Users Attributes Meta

File 5398b971-fix-tiny-window-when-resetting-zoom-factor-in-gtk2-build.patch of Package virt-viewer (Revision a746c94bd382e8dc8201ce343e4f61d0)

Currently displaying revision a746c94bd382e8dc8201ce343e4f61d0 , Show latest

Subject: Fix tiny window when resetting zoom factor in gtk2 build
From: Jonathon Jongsma jjongsma@redhat.com Wed Jun 11 13:09:30 2014 -0500
Date: Wed Jun 11 15:17:53 2014 -0500:
Git: b707b4524ff12ae1c2c3deff0e8c3f0d098f0503

rhbz#1104064 had a couple of symptoms. The first was fixed in
6edde57862ac30e74ce6412c93a2fa925ae4ea67.

The second symptom is that displays could also become tiny when clicking 'View >
Zoom > Normal Size'. This was because VirtViewerDisplay returned early from
_display_set_zoom_level() if the zoom level was being set to the current zoom
setting. However, the calling function (_window_set_zoom_level()) also tries to
queue a resize event for itself after setting the zoom level on the display. If
the display doesn't queue a resize event for itself, its size request will only
be 50x50 during the window resize negotiation. This causes the display to become
tiny and zoomed out. Queueing a resize on the display widget ensures that it
will request the proper size during the next allocation.

Index: virt-viewer-0.6.0/src/virt-viewer-display.c
===================================================================
--- virt-viewer-0.6.0.orig/src/virt-viewer-display.c
+++ virt-viewer-0.6.0/src/virt-viewer-display.c
@@ -592,12 +592,19 @@ void virt_viewer_display_set_zoom_level(
     if (zoom > MAX_ZOOM_LEVEL)
         zoom = MAX_ZOOM_LEVEL;
 
+    // For the gtk2 build, we need to queue a resize even if the zoom level
+    // hasn't changed.  This is due to the fact that VirtViewerWindow will queue
+    // a resize event for itself immediately after calling this function (in
+    // order to shrink the window to fit the new display size if necessary). If
+    // we don't queue a resize here, the window will become tiny because we will
+    // only request 50x50 during the window resize
+    virt_viewer_display_queue_resize(display);
+
     if (priv->zoom_level == zoom)
         return;
 
     priv->zoom_level = zoom;
 
-    virt_viewer_display_queue_resize(display);
     g_object_notify(G_OBJECT(display), "zoom-level");
 }

Places

File 5398b971-fix-tiny-window-when-resetting-zoom-factor-in-gtk2-build.patch of Package virt-viewer (Revision a746c94bd382e8dc8201ce343e4f61d0)

Places