nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1657 from Georgiy-Tugai/fix-flickering-shortened 

i3bar: fix flickering shortened status bar on other output(s)
This commit is contained in:
Michael Stapelberg 2015-04-26 23:38:27 +02:00
parent b3e8facb59 de866c2fea
commit 5dda3bc2ae
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
i3bar/src/xcb.c
View File

@ -1792,6 +1792,8 @@ void reconfig_windows(bool redraw_bars) {
void draw_bars(bool unhide) { void draw_bars(bool unhide) {
DLOG("Drawing bars...\n"); DLOG("Drawing bars...\n");
int workspace_width = 0; int workspace_width = 0;
/* Is the currently-rendered statusline using short_text items? */
bool rendered_statusline_is_short = false;
refresh_statusline(false); refresh_statusline(false);
@ -1941,8 +1943,15 @@ void draw_bars(bool unhide) {
uint32_t max_statusline_width = outputs_walk->rect.w - workspace_width - tray_width - 2 * logical_px(sb_hoff_px); uint32_t max_statusline_width = outputs_walk->rect.w - workspace_width - tray_width - 2 * logical_px(sb_hoff_px);
/* If the statusline is too long, try to use short texts. */ /* If the statusline is too long, try to use short texts. */
if (statusline_width > max_statusline_width) if (statusline_width > max_statusline_width) {
/* If the currently rendered statusline is long, render a short status line */
refresh_statusline(true); refresh_statusline(true);
rendered_statusline_is_short = true;
} else if (rendered_statusline_is_short) {
/* If the currently rendered statusline is short, render a long status line */
refresh_statusline(false);
rendered_statusline_is_short = false;
}
/* Luckily we already prepared a seperate pixmap containing the rendered /* Luckily we already prepared a seperate pixmap containing the rendered
* statusline, we just have to copy the relevant parts to the relevant * statusline, we just have to copy the relevant parts to the relevant