X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fframe.c;h=93263e270089e4c8bbebdc40086959c4f9b41b17;hb=c1d065243ad2d77aa27bd42de6bb7052c08fb8f9;hp=44ca9c4e997c02f6c0385a96395f4311a220db42;hpb=4a14e50ae744305660ea5186fe2d545c0124fc6b;p=chaz%2Fopenbox

diff --git a/openbox/frame.c b/openbox/frame.c
index 44ca9c4e..93263e27 100644
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -24,6 +24,7 @@
 #include "config.h"
 #include "framerender.h"
 #include "mainloop.h"
+#include "focus.h"
 #include "moveresize.h"
 #include "render/theme.h"
 
@@ -121,11 +122,16 @@ ObFrame *frame_new()
 static void set_theme_statics(ObFrame *self)
 {
     /* set colors/appearance/sizes for stuff that doesn't change */
-    XSetWindowBorder(ob_display, self->window, ob_rr_theme->b_color->pixel);
-    XSetWindowBorder(ob_display, self->title, ob_rr_theme->b_color->pixel);
-    XSetWindowBorder(ob_display, self->handle, ob_rr_theme->b_color->pixel);
-    XSetWindowBorder(ob_display, self->rgrip, ob_rr_theme->b_color->pixel);
-    XSetWindowBorder(ob_display, self->lgrip, ob_rr_theme->b_color->pixel);
+    XSetWindowBorder(ob_display, self->window,
+                     RrColorPixel(ob_rr_theme->b_color));
+    XSetWindowBorder(ob_display, self->title,
+                     RrColorPixel(ob_rr_theme->b_color));
+    XSetWindowBorder(ob_display, self->handle,
+                     RrColorPixel(ob_rr_theme->b_color));
+    XSetWindowBorder(ob_display, self->rgrip,
+                     RrColorPixel(ob_rr_theme->b_color));
+    XSetWindowBorder(ob_display, self->lgrip,
+                     RrColorPixel(ob_rr_theme->b_color));
 
     XResizeWindow(ob_display, self->max,
                   ob_rr_theme->button_size, ob_rr_theme->button_size);
@@ -420,6 +426,11 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
             PROP_SETA32(self->client->window, kde_net_wm_frame_strut,
                         cardinal, vals, 4);
         }
+
+        /* if this occurs while we are focus cycling, the indicator needs to
+           match the changes */
+        if (focus_cycle_target == self->client)
+            focus_cycle_draw_indicator();
     }
 }