2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c9fe875..77ccbbe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-23  Shawn Betts  <sabetts@vcn.bc.ca>
+
+	* src/bar.c (prepare_bar): cap the width and height to the size of
+	the screen.
+
 2006-05-23  Shawn Betts  <sabetts@vcn.bc.ca>
 
 	* src/actions.c (spawn): pass cmd twice to execcl
diff --git a/src/bar.c b/src/bar.c
index b1b7880..b459a5e 100644
--- a/src/bar.c
+++ b/src/bar.c
@@ -359,6 +359,8 @@ correct_mark (int msg_len, int *mark_start, int *mark_end)
 static void
 prepare_bar (rp_screen *s, int width, int height)
 {
+  width = width < s->width ? width : s->width;
+  height = height < s->height ? height : s->height;
   XMoveResizeWindow (dpy, s->bar_window,
                      bar_x (s, width), bar_y (s, height),
                      width, height);