X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fframe.c;h=5ee055308e849b534215b27be269e0bd4db9750c;hb=ecdb7d5807059405608629264e698b21b6222203;hp=29933d69fbe21d6444355ccd6299bb00a6cd6d91;hpb=6142eb3a48c78de29d0bce1d3ee5686f1bbf7ef9;p=chaz%2Fopenbox

diff --git a/openbox/frame.c b/openbox/frame.c
index 29933d69..5ee05530 100644
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -25,7 +25,8 @@
 #include "config.h"
 #include "framerender.h"
 #include "mainloop.h"
-#include "focus.h"
+#include "focus_cycle.h"
+#include "focus_cycle_indicator.h"
 #include "moveresize.h"
 #include "screen.h"
 #include "render/theme.h"
@@ -175,6 +176,14 @@ ObFrame *frame_new(ObClient *client)
 
 static void set_theme_statics(ObFrame *self)
 {
+    gint handle_height;
+
+    if (ob_rr_theme->handle_height > 0)
+        handle_height = ob_rr_theme->handle_height;
+    else
+        handle_height = 1;
+        
+
     /* set colors/appearance/sizes for stuff that doesn't change */
     XResizeWindow(ob_display, self->max,
                   ob_rr_theme->button_size, ob_rr_theme->button_size);
@@ -188,12 +197,10 @@ static void set_theme_statics(ObFrame *self)
                   ob_rr_theme->button_size, ob_rr_theme->button_size);
     XResizeWindow(ob_display, self->shade,
                   ob_rr_theme->button_size, ob_rr_theme->button_size);
-    if (ob_rr_theme->handle_height > 0) {
-        XResizeWindow(ob_display, self->lgrip,
-                      ob_rr_theme->grip_width, ob_rr_theme->handle_height);
-        XResizeWindow(ob_display, self->rgrip,
-                      ob_rr_theme->grip_width, ob_rr_theme->handle_height);
-    }
+    XResizeWindow(ob_display, self->lgrip,
+                  ob_rr_theme->grip_width, handle_height);
+    XResizeWindow(ob_display, self->rgrip,
+                  ob_rr_theme->grip_width, handle_height);
     XResizeWindow(ob_display, self->tltresize,
                   ob_rr_theme->grip_width, ob_rr_theme->paddingy + 1);
     XResizeWindow(ob_display, self->trtresize,
@@ -405,12 +412,18 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
             layout_title(self);
 
         if (!fake) {
-            if (self->decorations & OB_FRAME_DECOR_HANDLE &&
-                ob_rr_theme->handle_height > 0)
+            if (self->decorations & OB_FRAME_DECOR_HANDLE)
             {
+                gint handle_height;
+
+                if (ob_rr_theme->handle_height > 0)
+                    handle_height = ob_rr_theme->handle_height;
+                else
+                    handle_height = 1;
+
                 XMoveResizeWindow(ob_display, self->handle,
                                   -self->bwidth, FRAME_HANDLE_Y(self),
-                                  self->width, ob_rr_theme->handle_height);
+                                  self->width, handle_height);
                 XMapWindow(ob_display, self->handle);
 
                 if (self->decorations & OB_FRAME_DECOR_GRIPS) {
@@ -507,7 +520,7 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
         /* 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();
+            focus_cycle_draw_indicator(self->client);
     }
     if (resized && (self->decorations & OB_FRAME_DECOR_TITLEBAR))
         XResizeWindow(ob_display, self->label, self->label_width,