fix expanding window across the screen

test case included
This commit is contained in:
Sascha Kruse 2013-03-02 17:22:12 +01:00
parent 631c2f722f
commit c2a5b526e2
2 changed files with 10 additions and 6 deletions

View File

@ -145,7 +145,13 @@ function geometry {
killall dunst
../dunst -config dunstrc.default -geom "-300x1-20-20" &
../dunstify -a "dunst tester" -u c "-300x1-20-20"
../dunstify -a "dunst tester" -u c "-300x1-20-20"
basic_notifications
keypress
killall dunst
../dunst -config dunstrc.default -geom "x1" &
../dunstify -a "dunst tester" -u c "x1-20-20" "across the screen"
basic_notifications
keypress
}

8
x.c
View File

@ -204,7 +204,7 @@ static colored_layout *r_init_shared(cairo_t *c, notification *n)
cl->bg = x_string_to_color_t(n->color_strings[ColBG]);
int width = calculate_width();
if (xctx.geometry.w > 0) {
if (width) {
width -= 2 * settings.h_padding;
width -= 2 * settings.frame_width;
r_setup_pango_layout(cl->l, width);
@ -309,10 +309,8 @@ void x_win_draw(void)
text_width = MAX(w, text_width);
}
int width;
if (xctx.geometry.w > 0)
width = xctx.geometry.w;
else {
int width = calculate_width();
if (width <= 0) {
width = text_width + 2 * settings.h_padding;
width += 2 * settings.frame_width;
}