X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=e8d5ae4ddfab1dd05234068adbc99dcf38e46e2b;hb=7a6a516b8e3d8ad6b15379eabf6652a6f43eab27;hp=4c2c185f2b31b8fd700793cba723686ac8ee6df6;hpb=2a84418ee441d77d0d07760cbfc8359d0db624f4;p=chaz%2Fopenbox

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 4c2c185f..e8d5ae4d 100644
--- a/openbox/openbox.c
+++ b/openbox/openbox.c
@@ -261,7 +261,7 @@ gint main(gint argc, gchar **argv)
             /* load the theme specified in the rc file */
             {
                 RrTheme *theme;
-                if ((theme = RrThemeNew(ob_rr_inst, config_theme,
+                if ((theme = RrThemeNew(ob_rr_inst, config_theme, TRUE,
                                         config_font_activewindow,
                                         config_font_inactivewindow,
                                         config_font_menutitle,
@@ -273,6 +273,9 @@ gint main(gint argc, gchar **argv)
                 }
                 if (ob_rr_theme == NULL)
                     ob_exit_with_error(_("Unable to load a theme."));
+
+                PROP_SETS(RootWindow(ob_display, ob_screen),
+                          ob_theme, ob_rr_theme->name);
             }
 
             if (reconfigure) {
@@ -327,8 +330,14 @@ gint main(gint argc, gchar **argv)
                 /* redecorate all existing windows */
                 for (it = client_list; it; it = g_list_next(it)) {
                     ObClient *c = it->data;
+
                     /* the new config can change the window's decorations */
-                    client_setup_decor_and_functions(c, TRUE);
+                    client_setup_decor_and_functions(c, FALSE);
+                    /* redraw the frames */
+                    frame_adjust_area(c->frame, TRUE, TRUE, FALSE);
+                    /* the decor sizes may have changed, so the windows may
+                       end up in new positions */
+                    client_reconfigure(c);
                 }
             }