diff options
| author | Bastien Nocera <hadess@hadess.net> | 2022-02-08 13:16:32 +0100 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2022-02-08 15:54:33 +0100 |
| commit | e4f47591d3ae092d44e88f62f8304f87ddf15389 (patch) | |
| tree | 0e25ae9afb2c145df806ec90a5dde1ff5de7cab9 | |
| parent | e371395006e0c200def2fef646b362904154e238 (diff) | |
| download | totem-e4f47591d3ae092d44e88f62f8304f87ddf15389.tar.gz | |
main: Remove yet another intermediate box widget
tmw_bvw_box contained the video widget and an unused revealer.
| -rw-r--r-- | data/totem.ui | 17 | ||||
| -rw-r--r-- | src/totem-object.c | 14 |
2 files changed, 3 insertions, 28 deletions
diff --git a/data/totem.ui b/data/totem.ui index f80643215..e70da8863 100644 --- a/data/totem.ui +++ b/data/totem.ui @@ -186,23 +186,6 @@ <object class="GtkStack" id="tmw_main_stack"> <property name="visible">True</property> <property name="homogeneous">True</property> - <child> - <object class="GtkOverlay" id="tmw_bvw_box"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child type="overlay"> - <object class="GtkRevealer" id="toolbar-revealer"> - <property name="halign">fill</property> - <property name="valign">start</property> - <property name="visible">False</property> - <property name="no-show-all">True</property> - </object> - </child> - </object> - <packing> - <property name="name">player</property> - </packing> - </child> </object> </child> </object> diff --git a/src/totem-object.c b/src/totem-object.c index f8aea4ef1..b2fc48646 100644 --- a/src/totem-object.c +++ b/src/totem-object.c @@ -3852,8 +3852,6 @@ totem_setup_window (TotemObject *totem) int w, h; char *filename; GError *err = NULL; - GtkWidget *vbox; - GdkRGBA black; filename = g_build_filename (totem_dot_dir (), "state.ini", NULL); keyfile = g_key_file_new (); @@ -3897,11 +3895,6 @@ totem_setup_window (TotemObject *totem) gtk_window_maximize (GTK_WINDOW (totem->win)); } - /* Set the vbox to be completely black */ - vbox = GTK_WIDGET (gtk_builder_get_object (totem->xml, "tmw_bvw_box")); - gdk_rgba_parse (&black, "Black"); - gtk_widget_override_background_color (vbox, (GTK_STATE_FLAG_FOCUSED << 1), &black); - /* Headerbar */ totem->header = g_object_new (TOTEM_TYPE_MAIN_TOOLBAR, "show-search-button", TRUE, @@ -4238,7 +4231,6 @@ void video_widget_create (TotemObject *totem) { GError *err = NULL; - GtkContainer *container; totem->bvw = BACON_VIDEO_WIDGET (bacon_video_widget_new (&err)); @@ -4297,9 +4289,9 @@ video_widget_create (TotemObject *totem) G_CALLBACK (on_bvw_motion_notify_cb), totem); - container = GTK_CONTAINER (gtk_builder_get_object (totem->xml, "tmw_bvw_box")); - gtk_container_add (container, - GTK_WIDGET (totem->bvw)); + gtk_stack_add_named (GTK_STACK (totem->stack), + GTK_WIDGET (totem->bvw), + "player"); totem->bvw_grid = gtk_grid_new (); gtk_overlay_add_overlay (GTK_OVERLAY (totem->bvw), totem->bvw_grid); |