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

Fix clicking on workspaces in internal bar (with named workspaces) (Thanks bapt)

This commit is contained in:
Michael Stapelberg 2009-08-04 22:27:01 +02:00
parent 1aeaa153e5
commit 4c373c2128
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/handlers.c
View File

@ -276,16 +276,22 @@ static bool button_press_bar(xcb_connection_t *conn, xcb_button_press_event_t *e
} }
return true; return true;
} }
i3Font *font = load_font(conn, config.font); int drawn = 0;
int workspace = event->event_x / (font->height + 6),
c = 0;
/* Because workspaces can be on different screens, we need to loop /* Because workspaces can be on different screens, we need to loop
through all of them and decide to count it based on its ->screen */ through all of them and decide to count it based on its ->screen */
for (int i = 0; i < 10; i++) for (int i = 0; i < 10; i++) {
if ((workspaces[i].screen == screen) && (c++ == workspace)) { if (workspaces[i].screen != screen)
continue;
LOG("Checking if click was on workspace %d with drawn = %d, tw = %d\n",
i, drawn, workspaces[i].text_width);
if (event->event_x > (drawn + 1) &&
event->event_x <= (drawn + 1 + workspaces[i].text_width + 5 + 5)) {
show_workspace(conn, i+1); show_workspace(conn, i+1);
return true; return true;
} }
drawn += workspaces[i].text_width + 5 + 5 + 2;
}
return true; return true;
} }