X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fopenbox.c;h=d4f8423219db65d4773af9f9f98e8f9488d44bea;hb=819be4fea8d76da30b75c047d70833293af1002c;hp=42a062bef5a85d2e12b7649361c20af921144bd2;hpb=c726a1f709484da690a6fbcc7f6b8b4934660290;p=chaz%2Fopenbox

diff --git a/openbox/openbox.c b/openbox/openbox.c
index 42a062be..d4f84232 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,
@@ -275,7 +275,7 @@ gint main(gint argc, gchar **argv)
                     ob_exit_with_error(_("Unable to load a theme."));
 
                 PROP_SETS(RootWindow(ob_display, ob_screen),
-                          ob_theme, theme->name);
+                          ob_theme, ob_rr_theme->name);
             }
 
             if (reconfigure) {
@@ -330,10 +330,71 @@ gint main(gint argc, gchar **argv)
                 /* redecorate all existing windows */
                 for (it = client_list; it; it = g_list_next(it)) {
                     ObClient *c = it->data;
+                    Strut oldsize, newsize;
+                    gint dx, dy;
+
+                    oldsize = c->frame->size;
+                    dx = dy = 0;
+
                     /* the new config can change the window's decorations */
                     client_setup_decor_and_functions(c, TRUE);
                     /* redraw the frames */
                     frame_adjust_area(c->frame, TRUE, TRUE, FALSE);
+
+                    /* move windows if their decorations are a new size, based
+                       on their gravity */
+                    newsize = c->frame->size;
+
+                    /* x coord */
+                    switch (c->gravity) {
+                    case NorthWestGravity:
+                    case WestGravity:
+                    case SouthWestGravity:
+                        break;
+                    case NorthGravity:
+                    case CenterGravity:
+                    case SouthGravity:
+                        dx = (newsize.left - oldsize.left +
+                              oldsize.right - newsize.right) / 2;
+                        break;
+                    case NorthEastGravity:
+                    case EastGravity:
+                    case SouthEastGravity:
+                        dx = -(newsize.left - oldsize.left +
+                               newsize.right - oldsize.right);
+
+                        break;
+                    case StaticGravity:
+                        dx = -(newsize.left - oldsize.left);
+                        break;
+                    }
+
+                    /* y coord */
+                    switch (c->gravity) {
+                    case NorthWestGravity:
+                    case NorthGravity:
+                    case NorthEastGravity:
+                        break;
+                    case WestGravity:
+                    case CenterGravity:
+                    case EastGravity:
+                        dy = (newsize.top - oldsize.top +
+                              oldsize.bottom - newsize.bottom) / 2;
+                        break;
+                    case SouthWestGravity:
+                    case SouthGravity:
+                    case SouthEastGravity:
+                        dy = -(newsize.top - oldsize.top +
+                               newsize.bottom - oldsize.bottom);
+
+                        break;
+                    case StaticGravity:
+                        dx = -(newsize.top - oldsize.top);
+                        break;
+                    }
+
+                    if (dx || dy)
+                        client_move(c, c->area.x + dx, c->area.y + dy);
                 }
             }