summaryrefslogtreecommitdiff
path: root/plugins/gtkui/gtkui.c
diff options
context:
space:
mode:
authorGravatar waker <wakeroid@gmail.com>2013-08-19 21:42:41 +0200
committerGravatar waker <wakeroid@gmail.com>2013-08-19 21:42:41 +0200
commitb5cb09a2269d38e100d9023f831676d784b2ad31 (patch)
treef5060356e9619b56d00cb6bc3fef43d26466bb20 /plugins/gtkui/gtkui.c
parent99a3ab588806887523f12a06e73cb2daa27086d3 (diff)
gtkui: move widget init after showing the main window -- this fixes initial GtkPaned positioning
Diffstat (limited to 'plugins/gtkui/gtkui.c')
-rw-r--r--plugins/gtkui/gtkui.c48
1 files changed, 24 insertions, 24 deletions
diff --git a/plugins/gtkui/gtkui.c b/plugins/gtkui/gtkui.c
index c8604599..8752a0f1 100644
--- a/plugins/gtkui/gtkui.c
+++ b/plugins/gtkui/gtkui.c
@@ -1016,30 +1016,6 @@ gtkui_thread (void *ctx) {
deadbeef->conf_set_str ("hotkey.key24", "\"Alt 9\" 0 0 playlist9");
deadbeef->conf_set_str ("hotkey.key25", "\"Alt 0\" 0 0 playlist10");
}
-
- // construct mainwindow widgets
- {
-
- w_init ();
- ddb_gtkui_widget_t *rootwidget = w_get_rootwidget ();
- gtk_widget_show (rootwidget->widget);
- gtk_box_pack_start (GTK_BOX(lookup_widget(mainwin, "plugins_bottom_vbox")), rootwidget->widget, TRUE, TRUE, 0);
-
- // load layout
- char layout[4000];
- deadbeef->conf_get_str ("gtkui.layout", "tabbed_playlist \"\" { }", layout, sizeof (layout));
-
- ddb_gtkui_widget_t *w = NULL;
- w_create_from_string (layout, &w);
- if (!w) {
- ddb_gtkui_widget_t *plt = w_create ("tabbed_playlist");
- w_append (rootwidget, plt);
- gtk_widget_show (plt->widget);
- }
- else {
- w_append (rootwidget, w);
- }
- }
#if GTK_CHECK_VERSION(3,0,0)
gtk_widget_set_events (GTK_WIDGET (mainwin), gtk_widget_get_events (GTK_WIDGET (mainwin)) | GDK_SCROLL_MASK);
#endif
@@ -1094,6 +1070,30 @@ gtkui_thread (void *ctx) {
gtk_widget_show (mainwin);
+ // construct mainwindow widgets
+ {
+
+ w_init ();
+ ddb_gtkui_widget_t *rootwidget = w_get_rootwidget ();
+ gtk_widget_show (rootwidget->widget);
+ gtk_box_pack_start (GTK_BOX(lookup_widget(mainwin, "plugins_bottom_vbox")), rootwidget->widget, TRUE, TRUE, 0);
+
+ // load layout
+ char layout[4000];
+ deadbeef->conf_get_str ("gtkui.layout", "tabbed_playlist \"\" { }", layout, sizeof (layout));
+
+ ddb_gtkui_widget_t *w = NULL;
+ w_create_from_string (layout, &w);
+ if (!w) {
+ ddb_gtkui_widget_t *plt = w_create ("tabbed_playlist");
+ w_append (rootwidget, plt);
+ gtk_widget_show (plt->widget);
+ }
+ else {
+ w_append (rootwidget, w);
+ }
+ }
+
gtkui_setup_gui_refresh ();
char fmt[500];