From 65de317290740cb75b429c498273edac844c1fe9 Mon Sep 17 00:00:00 2001 From: Krifa75 Date: Thu, 24 Nov 2022 23:12:57 +0100 Subject: main: Use HdyApplicationWindow instead of GtkApplicationWindow Make sure to hide the windowed headerbar in fullscreen mode, as HdyWindow doesn't have a titlebar, unlike GtkWindow, and the documentation warns us not to use gtk_window_set_titlebar(). --- data/totem.ui | 818 +++++++++++++++++++++++++++-------------------------- src/totem-object.c | 1 + 2 files changed, 413 insertions(+), 406 deletions(-) diff --git a/data/totem.ui b/data/totem.ui index 80af565c8..8099e28be 100644 --- a/data/totem.ui +++ b/data/totem.ui @@ -186,528 +186,534 @@ 0 - + False GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK - - + + True - True - True - True - Videos - - - + vertical - + True - center - True - addmenu - - + True + True + True + Videos + + + - + True - list-add-symbolic - 1 + center + True + addmenu + + + + + True + list-add-symbolic + 1 + + + + start + - - - start - - - - - True - center - True - appmenu - - - + True - open-menu-symbolic - 1 + center + True + appmenu + + + + + True + open-menu-symbolic + 1 + + + + end + 0 + - - - end - 0 - - - - - False - True - center - True - playermenu - - - - True - view-more-symbolic - 1 + + False + True + center + True + playermenu + + + + + True + view-more-symbolic + 1 + + + + end + - - - end - - - - - False - True - center - True - subtitlesmenu - - - - True - media-view-subtitles-symbolic - 1 + + False + True + center + True + subtitlesmenu + + + + + True + media-view-subtitles-symbolic + 1 + + + + end + - - - end - - - - - False - True - center - app.fullscreen - - - True - view-fullscreen-symbolic - 1 + + False + True + center + app.fullscreen + + + + True + view-fullscreen-symbolic + 1 + + + + end + - - end - - - - - - True - True - + True - GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK - - - - - - - - - - - - - - - - - - - - - + True + + True - fill - fill - - - False - False - False - True - 0.86 + GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK + + + + + + + + + + + + + + + + + + + + + + True fill - True - - - + fill - - True - True - center - app.fullscreen - + + False + False + False + True + 0.86 + fill + True + + + - + True - view-restore-symbolic - 1 + True + center + app.fullscreen + + + + True + view-restore-symbolic + 1 + + + + end + - - - end - - - - - True - center - True - playermenu - - - + True - view-more-symbolic - 1 + center + True + playermenu + + + + + True + view-more-symbolic + 1 + + + + end + + + + + True + center + True + subtitlesmenu + + + + + True + media-view-subtitles-symbolic + 1 + + + + + end + - end + 0 + 0 + 3 + 1 - - True - center - True - subtitlesmenu - + + False + True + True - - - True - media-view-subtitles-symbolic - 1 - - - end + 1 + 2 + 1 + 1 - - - 0 - 0 - 3 - 1 - - - - - False - True - True - - - - 1 - 2 - 1 - 1 - - - - - True - False - 0 - 0.86 - True - True - end - - + True False + 0 + 0.86 + True + True + end + - + True False - - + True - center - app.previous-chapter - Previous Chapter/Movie - - - Previous Chapter/Movie - - - - - True - media-skip-backward-symbolic - 1 - - + False - - - - - True - center - icon_play - app.play - Play / Pause - - - Play / Pause + + + True + center + app.previous-chapter + Previous Chapter/Movie + + + Previous Chapter/Movie + + + + + True + media-skip-backward-symbolic + 1 + + + - - - - - - True - center - app.next-chapter - Next Chapter/Movie - - - Next Chapter/Movie + + + True + center + icon_play + app.play + Play / Pause + + + Play / Pause + + + - + True - media-skip-forward-symbolic - 1 + center + app.next-chapter + Next Chapter/Movie + + + Next Chapter/Movie + + + + + True + media-skip-forward-symbolic + 1 + + + - + + False + False + - - - False - False - - - - - True - False - + True False - 0 - 4 - - - True - False - 16 - - - False - True - 0 - - - - - True - False - True - False - False - - - - - - True - True - 1 - - - + True False - True - 16 + 0 + 4 + + + True + False + 16 + + + False + True + 0 + + + + + True + False + True + False + False + + + + + + True + True + 1 + + + + + True + False + True + 16 + + + False + True + 2 + + - - False - True - 2 - + + True + False + - - - True - False - - - - - True - False - + True False - vertical - + True - True - True - normal - center - True - gomenu - - + False + vertical - + True - False - go-jump-symbolic + True + True + normal + center + True + gomenu + + + + + True + False + go-jump-symbolic + + + + True + True + 0 + - - True - True - 0 - + + False + True + - - - False - True - - - - - True - False - + True False - vertical - + True - False - True - True - True - none - False + False vertical - center - audio-volume-muted-symbolic + + + True + False + True + True + True + none + False + vertical + center + audio-volume-muted-symbolic audio-volume-high-symbolic audio-volume-low-symbolic audio-volume-medium-symbolic - True - - - + True + + + + + + True + True + 0 + + - - True - True - 0 - + + False + True + - - False - True + + 0 + 2 + 3 + 1 - - - 0 - 2 - 3 - 1 - - + + + + player + - - player - diff --git a/src/totem-object.c b/src/totem-object.c index 25c07d0e4..342168ace 100644 --- a/src/totem-object.c +++ b/src/totem-object.c @@ -3899,6 +3899,7 @@ totem_setup_window (TotemObject *totem) /* Headerbar */ totem->header = GTK_WIDGET (gtk_builder_get_object (totem->xml, "header")); + g_object_bind_property (totem, "fullscreen", totem->header, "visible", G_BINDING_SYNC_CREATE | G_BINDING_INVERT_BOOLEAN); return; } -- cgit v1.2.1