aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2025-02-02 15:08:01 -05:00
Code

Right-aligned statusbar items weren't positioned correctly.

Browse Source 
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2021 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2001-11-15 18:44:58 +00:00 committed by cras
parent 5563a8f203
commit 39f9073586
1 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/fe-text/statusbar.c
View File

@ -235,7 +235,7 @@ static void statusbar_resize_items(STATUSBAR_REC *bar, int max_width)
static void statusbar_calc_item_positions(STATUSBAR_REC *bar) static void statusbar_calc_item_positions(STATUSBAR_REC *bar)
{ {
WINDOW_REC *old_active_win; WINDOW_REC *old_active_win;
GSList *tmp; GSList *tmp, *right_items;
int xpos, rxpos; int xpos, rxpos;
old_active_win = active_win; old_active_win = active_win;
@ -266,26 +266,33 @@ static void statusbar_calc_item_positions(STATUSBAR_REC *bar)
} }
} }
/* right-aligned items */ /* right-aligned items - first copy them to a new list backwards,
rxpos = term_width; easier to draw them in right order */
right_items = NULL;
for (tmp = bar->items; tmp != NULL; tmp = tmp->next) { for (tmp = bar->items; tmp != NULL; tmp = tmp->next) {
SBAR_ITEM_REC *rec = tmp->data; SBAR_ITEM_REC *rec = tmp->data;
if (rec->config->right_alignment && rec->size > 0) { if (rec->config->right_alignment && rec->size > 0)
if (SBAR_ITEM_REDRAW_NEEDED(bar, rec, xpos)) { right_items = g_slist_prepend(right_items, rec);
rec->dirty = TRUE; }
if (bar->dirty_xpos == -1 ||
xpos < bar->dirty_xpos) {
irssi_set_dirty();
bar->dirty = TRUE;
bar->dirty_xpos = xpos;
}
rec->xpos = rxpos;
}
rxpos -= rec->size; rxpos = term_width;
for (tmp = right_items; tmp != NULL; tmp = tmp->next) {
SBAR_ITEM_REC *rec = tmp->data;
rxpos -= rec->size;
if (SBAR_ITEM_REDRAW_NEEDED(bar, rec, rxpos)) {
rec->dirty = TRUE;
if (bar->dirty_xpos == -1 ||
rxpos < bar->dirty_xpos) {
irssi_set_dirty();
bar->dirty = TRUE;
bar->dirty_xpos = rxpos;
}
rec->xpos = rxpos;
} }
} }
g_slist_free(right_items);
active_win = old_active_win; active_win = old_active_win;
} }