summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsabetts <sabetts>2003-08-11 00:02:36 +0000
committersabetts <sabetts>2003-08-11 00:02:36 +0000
commit34dd647431e988910eb373f30e81ab252afc99b5 (patch)
treebe51bb941051ee68750199ad3d4ef4585422af0c
parentcf5670a2913d31945f685138cdefa86a2582779c (diff)
downloadratpoison-34dd647431e988910eb373f30e81ab252afc99b5.zip
(prepare_bar): just use height for the height of the window.
(marked_message): add the padding to the height of the window.
-rw-r--r--ChangeLog2
-rw-r--r--src/bar.c5
2 files changed, 4 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 2549808..49a5975 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
* src/bar.c (get_mark_box): take the bar padding into account when
calculate the top of the highlight bar.
+ (prepare_bar): just use height for the height of the window.
+ (marked_message): add the padding to the height of the window.
* src/window.c (give_window_focus): only save the pointer position
when win and last_win aren't the same window.
diff --git a/src/bar.c b/src/bar.c
index 22f8e77..a622401 100644
--- a/src/bar.c
+++ b/src/bar.c
@@ -376,8 +376,7 @@ prepare_bar (rp_screen *s, int width, int height)
XMoveResizeWindow (dpy, s->bar_window,
bar_x (s, width), bar_y (s, height),
- width,
- height + defaults.bar_y_padding * 2);
+ width, height);
XRaiseWindow (dpy, s->bar_window);
XClearWindow (dpy, s->bar_window);
@@ -513,7 +512,7 @@ marked_message (char *msg, int mark_start, int mark_end)
/* Calculate the width and height of the window. */
num_lines = count_lines (msg, strlen(msg));
width = defaults.bar_x_padding * 2 + max_line_length(msg);
- height = FONT_HEIGHT (defaults.font) * num_lines;
+ height = FONT_HEIGHT (defaults.font) * num_lines + defaults.bar_y_padding * 2;
/* Display the string. */
prepare_bar (s, width, height);