[virt-tools-list] [virt-viewer PATCH] Ensure all windows obey initial --zoom setting

[Marc-André Lureau]

ack

On Thu, Nov 21, 2013 at 7:42 PM, Jonathon Jongsma <jjongsma at redhat.com> wrote:
> There are cases where multiple VirtViewerWindow objects are created before the
> VirtViewerApp constructor has a chance to run. Since the constructor has not yet
> run, priv->main_window will still be NULL, the test in
> virt_viewer_app_window_new() will fail, and they will not get their initial zoom
> level set.  When the constructor finally runs, it set the zoom level of the main
> window to the value set on the command line, but all other windows that had
> already been created retained the default 100% zoom level.
>
> By creating the main_window in the instance init function, we ensure that the
> main window is created before we get any 'session-display-added' signals and all
> displays will start out with consistent zoom levels.
> ---
>  src/virt-viewer-app.c | 10 ++++------
>  1 file changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/src/virt-viewer-app.c b/src/virt-viewer-app.c
> index 9eff696..029f213 100644
> --- a/src/virt-viewer-app.c
> +++ b/src/virt-viewer-app.c
> @@ -1571,6 +1571,8 @@ virt_viewer_app_init (VirtViewerApp *self)
>      self->priv->config = g_key_file_new();
>      self->priv->config_file = g_build_filename(g_get_user_config_dir(),
>                                                 "virt-viewer", "settings", NULL);
> +    self->priv->main_window = virt_viewer_app_window_new(self, 0);
> +    self->priv->main_notebook = GTK_WIDGET(virt_viewer_window_get_notebook(self->priv->main_window));
>
>      g_key_file_load_from_file(self->priv->config, self->priv->config_file,
>                      G_KEY_FILE_KEEP_COMMENTS|G_KEY_FILE_KEEP_TRANSLATIONS, &error);
> @@ -1586,6 +1588,8 @@ virt_viewer_app_init (VirtViewerApp *self)
>
>      self->priv->verbose = opt_verbose;
>      self->priv->quit_on_disconnect = opt_kiosk ? opt_kiosk_quit : TRUE;
> +
> +    virt_viewer_window_set_zoom_level(self->priv->main_window, opt_zoom);
>  }
>
>  static void
> @@ -1647,14 +1651,9 @@ virt_viewer_app_constructor (GType gtype,
>  {
>      GObject *obj;
>      VirtViewerApp *self;
> -    VirtViewerAppPrivate *priv;
>
>      obj = G_OBJECT_CLASS (virt_viewer_app_parent_class)->constructor (gtype, n_properties, properties);
>      self = VIRT_VIEWER_APP(obj);
> -    priv = self->priv;
> -
> -    priv->main_window = virt_viewer_app_window_new(self, 0);
> -    priv->main_notebook = GTK_WIDGET(virt_viewer_window_get_notebook(priv->main_window));
>
>      virt_viewer_set_insert_smartcard_accel(self, GDK_F8, GDK_SHIFT_MASK);
>      virt_viewer_set_remove_smartcard_accel(self, GDK_F9, GDK_SHIFT_MASK);
> @@ -1663,7 +1662,6 @@ virt_viewer_app_constructor (GType gtype,
>      gtk_accel_map_add_entry("<virt-viewer>/view/zoom-reset", GDK_0, GDK_CONTROL_MASK);
>      gtk_accel_map_add_entry("<virt-viewer>/send/secure-attention", GDK_End, GDK_CONTROL_MASK | GDK_MOD1_MASK);
>
> -    virt_viewer_window_set_zoom_level(priv->main_window, opt_zoom);
>      virt_viewer_app_set_fullscreen(self, opt_fullscreen);
>      virt_viewer_app_set_hotkeys(self, opt_hotkeys);
>      virt_viewer_app_set_kiosk(self, opt_kiosk);
> --
> 1.8.3.1
>
> _______________________________________________
> virt-tools-list mailing list
> virt-tools-list at redhat.com
> https://www.redhat.com/mailman/listinfo/virt-tools-list



-- 
Marc-André Lureau