pxcloud/virt-viewer
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/virt-viewer synced 2026-01-27 03:19:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add nth window to virt_viewer_app_window_new()

Browse Source
This commit is contained in:
Marc-André Lureau 2011-07-21 18:57:30 +02:00 committed by Daniel P. Berrange
parent be529a879f
commit 08b292fb05
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/virt-viewer-app.c
View File

@ -173,15 +173,6 @@ virt_viewer_app_simple_message_dialog(VirtViewerApp *self,
g_free(msg);
}
static VirtViewerWindow*
virt_viewer_app_window_new(VirtViewerApp *self, GtkWidget *container)
{
return g_object_new(VIRT_VIEWER_TYPE_WINDOW,
"app", self,
"container", container,
NULL);
}
void
virt_viewer_app_quit(VirtViewerApp *self)
{
@ -378,6 +369,23 @@ virt_viewer_app_set_nth_window(VirtViewerApp *self, gint nth, VirtViewerWindow *
g_hash_table_insert(self->priv->windows, key, win);
}
static VirtViewerWindow*
virt_viewer_app_window_new(VirtViewerApp *self, GtkWidget *container, gint nth)
{
VirtViewerWindow* window;
window = g_object_new(VIRT_VIEWER_TYPE_WINDOW,
"app", self,
"container", container,
NULL);
virt_viewer_app_set_nth_window(self, nth, window);
/* this will set new window to fullscreen if necessary */
virt_viewer_app_set_fullscreen(self, self->priv->fullscreen);
return window;
}
static void
virt_viewer_app_display_added(VirtViewerSession *session G_GNUC_UNUSED,
VirtViewerDisplay *display,
@ -397,10 +405,7 @@ virt_viewer_app_display_added(VirtViewerSession *session G_GNUC_UNUSED,
}
g_return_if_fail(virt_viewer_app_get_nth_window(self, nth) == NULL);
window = virt_viewer_app_window_new(self, NULL);
/* TODO: track fullscreen state */
gtk_widget_show_all(GTK_WIDGET(virt_viewer_window_get_window(window)));
virt_viewer_app_set_nth_window(self, nth, window);
window = virt_viewer_app_window_new(self, NULL, nth);
}
virt_viewer_window_set_display(window, display);
@ -948,9 +953,8 @@ virt_viewer_app_constructor (GType gtype,
self = VIRT_VIEWER_APP(obj);
priv = self->priv;
priv->main_window = virt_viewer_app_window_new(self, priv->container);
priv->main_window = virt_viewer_app_window_new(self, priv->container, 0);
priv->main_notebook = GTK_WIDGET(virt_viewer_window_get_notebook(priv->main_window));
virt_viewer_app_set_nth_window(self, 0, priv->main_window);
return obj;
}

1
src/virt-viewer-window.c
View File

@ -764,6 +764,7 @@ virt_viewer_window_toolbar_setup(VirtViewerWindow *self)
ViewAutoDrawer_SetFill(VIEW_AUTODRAWER(priv->layout), FALSE);
ViewAutoDrawer_SetOverlapPixels(VIEW_AUTODRAWER(priv->layout), 1);
ViewAutoDrawer_SetNoOverlapPixels(VIEW_AUTODRAWER(priv->layout), 0);
gtk_widget_show(priv->layout);
}
VirtViewerNotebook*