[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/24] gtk: simplify resize
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 10/24] gtk: simplify resize |
Date: |
Mon, 26 May 2014 10:14:05 +0200 |
Simply ask for a small window size. When the widgets don't fit in gtk
will automatically make the window large enougth to make things fit, no
need to try (and fail) duplicate that logic in qemu.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
ui/gtk.c | 40 ++++++++++++++--------------------------
1 file changed, 14 insertions(+), 26 deletions(-)
diff --git a/ui/gtk.c b/ui/gtk.c
index a8393dd..6790cf8 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -296,35 +296,23 @@ static void gd_update_caption(GtkDisplayState *s)
static void gd_update_windowsize(VirtualConsole *vc)
{
GtkDisplayState *s = vc->s;
+ double sx, sy;
- if (!s->full_screen) {
- GtkRequisition req;
- double sx, sy;
-
- if (s->free_scale) {
- sx = vc->gfx.scale_x;
- sy = vc->gfx.scale_y;
-
- vc->gfx.scale_y = 1.0;
- vc->gfx.scale_x = 1.0;
- } else {
- sx = 1.0;
- sy = 1.0;
- }
-
- gtk_widget_set_size_request
- (vc->gfx.drawing_area,
- surface_width(vc->gfx.ds) * vc->gfx.scale_x,
- surface_height(vc->gfx.ds) * vc->gfx.scale_y);
-#if GTK_CHECK_VERSION(3, 0, 0)
- gtk_widget_get_preferred_size(s->vbox, NULL, &req);
-#else
- gtk_widget_size_request(s->vbox, &req);
-#endif
+ if (vc->type != GD_VC_GFX || s->full_screen) {
+ return;
+ }
- gtk_window_resize(GTK_WINDOW(s->window),
- req.width * sx, req.height * sy);
+ if (s->free_scale) {
+ sx = 1.0;
+ sy = 1.0;
+ } else {
+ sx = vc->gfx.scale_x;
+ sy = vc->gfx.scale_y;
}
+ gtk_widget_set_size_request(vc->gfx.drawing_area,
+ surface_width(vc->gfx.ds) * sx,
+ surface_height(vc->gfx.ds) * sy);
+ gtk_window_resize(GTK_WINDOW(s->window), 320, 240);
}
static void gd_update_full_redraw(VirtualConsole *vc)
--
1.8.3.1
- [Qemu-devel] [PULL 00/24] gtk: ui overhaul, multiwindow support., Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 01/24] gtk: zap scrolled_window, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 03/24] gtk: cleanup CONFIG_VTE ifdef a bit., Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 05/24] gtk: remove page numbering assumtions from the code, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 04/24] gtk: Add a scrollbar for text consoles, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 09/24] gtk: use device type as label, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 21/24] gtk: Add handling for the xfree86 keycodes, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 08/24] gtk: support multiple gfx displays, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 10/24] gtk: simplify resize,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 06/24] gtk: VirtualConsole restruction, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 12/24] gtk: add tab to trace events, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 14/24] gtk: keep track of grab owner, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 11/24] gtk: allow moving tabs to windows and back., Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 15/24] gtk: skip keyboard grab when hover autograb is active, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 13/24] gtk: add gd_grab trace event, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 19/24] gtk: detached window pointer grabs, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 02/24] gtk: zap vte size requests, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 16/24] gtk: update gd_update_caption, Gerd Hoffmann, 2014/05/26
- [Qemu-devel] [PULL 22/24] gtk: zap unused global_state, Gerd Hoffmann, 2014/05/26