give different border colors to active and inactive windows. adjust the xml theme...

[chaz/openbox] / openbox / frame.c

diff --git a/openbox/frame.c b/openbox/frame.c
index 1f45ea8b145217d7d72beaf8c8232dde8e0c1325..6248db7c0639e157fd923fb05618f2bc768a885b 100644 (file)
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -184,19 +184,6 @@ ObFrame *frame_new(ObClient *client)
 static void set_theme_statics(ObFrame *self)
 {
     /* set colors/appearance/sizes for stuff that doesn't change */
-    XSetWindowBorder(ob_display, self->window,
-                     RrColorPixel(ob_rr_theme->frame_b_color));
-    XSetWindowBorder(ob_display, self->inner,
-                     RrColorPixel(ob_rr_theme->frame_b_color));
-    XSetWindowBorder(ob_display, self->title,
-                     RrColorPixel(ob_rr_theme->frame_b_color));
-    XSetWindowBorder(ob_display, self->handle,
-                     RrColorPixel(ob_rr_theme->frame_b_color));
-    XSetWindowBorder(ob_display, self->rgrip,
-                     RrColorPixel(ob_rr_theme->frame_b_color));
-    XSetWindowBorder(ob_display, self->lgrip,
-                     RrColorPixel(ob_rr_theme->frame_b_color));
-
     XResizeWindow(ob_display, self->max,
                   ob_rr_theme->button_size, ob_rr_theme->button_size);
     XResizeWindow(ob_display, self->iconify,
@@ -576,9 +563,6 @@ void frame_grab_client(ObFrame *self)
     /* map the client so it maps when the frame does */
     XMapWindow(ob_display, self->client->window);
 
-    /* adjust the frame to the client's size */
-    frame_adjust_area(self, FALSE, TRUE, FALSE);
-
     /* set all the windows for the frame in the window_map */
     g_hash_table_insert(window_map, &self->window, self->client);
     g_hash_table_insert(window_map, &self->plate, self->client);
@@ -728,9 +712,9 @@ static void layout_title(ObFrame *self)
             } else if (*lc == 'N') {
                 if (firstcon) *firstcon = OB_FRAME_CONTEXT_ICON;
                 if ((self->icon_on = is_button_present(self, lc, i))) {
-                    /* icon gets extra padding */
+                    /* icon is bigger than buttons */
                     self->label_width -= bwidth + 2;
-                    self->icon_x = x + (i * 1);
+                    self->icon_x = x;
                     x += i * (bwidth + 2);
                 }
             } else if (*lc == 'D') {