summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsabetts <sabetts>2006-08-24 00:07:37 +0000
committersabetts <sabetts>2006-08-24 00:07:37 +0000
commitd0c7cae25a54f6972c97c032ea4ae356933146bc (patch)
tree5ce0e450c8130a4a48ef3e262cee2a8ca96e3aeb
parente6ca8c9e05ea8f8ef75e867e1e8b1dc258eeb711 (diff)
downloadratpoison-d0c7cae25a54f6972c97c032ea4ae356933146bc.zip
(prepare_bar): cap the width and height to the size of
the screen.
-rw-r--r--ChangeLog5
-rw-r--r--src/bar.c2
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);