pxcloud/virt-viewer
5
0
Fork 0
mirror of https://gitlab.uni-freiburg.de/opensourcevdi/virt-viewer synced 2025-12-27 14:54:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

app: simplify toggling visibility

Browse Source 
There is a hack to maintain the toggle state to a desired state within
the "toggled" handler.

However it is only necessary for the ask-quit case. In this case, we
want to maintain the item active, which is simpler to handle than the
general case. Simplify the code by folding
virt_viewer_app_window_set_visible() and removing the static
"reentering" hack, only maintaining "active" on the last item.

Note that the hack was needed since there is no way to hook a signal
handler on "clicked" before "toggled" is emitted and handled by Gtk,
to avoid the recursion.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Acked-by: Victor Toso <victortoso@redhat.com>
This commit is contained in:
Marc-André Lureau 2018-07-26 15:38:43 +02:00
parent b6d3755452
commit 41f889f84d
2 changed files with 12 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -504,29 +504,6 @@ virt_viewer_app_get_n_windows_visible(VirtViewerApp *self)
return n;
}
gboolean
virt_viewer_app_window_set_visible(VirtViewerApp *self,
VirtViewerWindow *window,
gboolean visible)
{
g_return_val_if_fail(VIRT_VIEWER_IS_APP(self), FALSE);
g_return_val_if_fail(VIRT_VIEWER_IS_WINDOW(window), FALSE);
if (visible) {
virt_viewer_window_show(window);
return TRUE;
} else {
if (virt_viewer_app_get_n_windows_visible(self) > 1) {
virt_viewer_window_hide(window);
return FALSE;
}
virt_viewer_app_maybe_quit(self, window);
}
return FALSE;
}
static void hide_one_window(gpointer value,
gpointer user_data G_GNUC_UNUSED)
{
@ -2192,19 +2169,21 @@ menu_display_visible_toggled_cb(GtkCheckMenuItem *checkmenuitem,
{
VirtViewerApp *self = virt_viewer_session_get_app(virt_viewer_display_get_session(display));
gboolean visible = gtk_check_menu_item_get_active(checkmenuitem);
static gboolean reentering = FALSE;
VirtViewerWindow *vwin;
if (reentering) /* do not reenter if I switch you back */
return;
reentering = TRUE;
vwin = ensure_window_for_display(self, display);
visible = virt_viewer_app_window_set_visible(self, vwin, visible);
gtk_check_menu_item_set_active(checkmenuitem, /* will be toggled again */ !visible);
reentering = FALSE;
if (visible) {
virt_viewer_window_show(vwin);
} else {
if (virt_viewer_app_get_n_windows_visible(self) > 1) {
virt_viewer_window_hide(vwin);
} else {
virt_viewer_app_maybe_quit(self, vwin);
/* the last item remains active, doesn't matter if we quit */
gtk_check_menu_item_set_active(checkmenuitem, TRUE);
}
}
virt_viewer_session_update_displays_geometry(virt_viewer_display_get_session(display));
}

2
src/virt-viewer-app.h
View File

@ -84,7 +84,7 @@ void virt_viewer_app_set_connect_info(VirtViewerApp *self,
const gchar *user,
gint port,
const gchar *guri);
gboolean virt_viewer_app_window_set_visible(VirtViewerApp *self, VirtViewerWindow *window, gboolean visible);
void virt_viewer_app_show_status(VirtViewerApp *self, const gchar *fmt, ...);
void virt_viewer_app_show_display(VirtViewerApp *self);
GList* virt_viewer_app_get_windows(VirtViewerApp *self);