nagbalae/dunst
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

calculate width after finalizing all texts

Browse Source
This commit is contained in:
Sascha Kruse 2012-10-06 22:23:32 +02:00
parent f48522a322
commit e97c0106ca
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dunst.c
View File

@ -574,19 +574,6 @@ void draw_win(void)
line_cnt += n->draw_txt_buf.line_count; line_cnt += n->draw_txt_buf.line_count;
} }
/* if we have a dynamic width, calculate the actual width */
if (width == 0) {
for (l_node * iter = displayed_notifications->head; iter;
iter = iter->next) {
notification *n = (notification *) iter->data;
for (int i = 0; i < n->draw_txt_buf.line_count; i++) {
char *line =
draw_txt_get_line(&n->draw_txt_buf, i+1);
assert(line != NULL);
width = MAX(width, textw(dc, line));
}
}
}
/* calculate height */ /* calculate height */
@ -626,10 +613,23 @@ void draw_win(void)
n->draw_txt_buf.line_count); n->draw_txt_buf.line_count);
for (; *print_to != '\0'; print_to++) ; for (; *print_to != '\0'; print_to++) ;
} }
snprintf(print_to, x_more_len, "(%d more)", more); snprintf(print_to, x_more_len, "(%d more)", more);
} }
/* if we have a dynamic width, calculate the actual width */
if (width == 0) {
for (l_node * iter = displayed_notifications->head; iter;
iter = iter->next) {
notification *n = (notification *) iter->data;
for (int i = 0; i < n->draw_txt_buf.line_count; i++) {
char *line =
draw_txt_get_line(&n->draw_txt_buf, i+1);
assert(line != NULL);
width = MAX(width, textw(dc, line));
}
}
}
assert(line_height > 0); assert(line_height > 0);
assert(font_h > 0); assert(font_h > 0);
assert(width > 0); assert(width > 0);