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

Bugfix: Correctly render decorations in tabbed containers (don’t overlap) 

This fixes a regression introduced in b644fb5f26.
This commit is contained in:
Michael Stapelberg 2011-05-01 18:48:30 +02:00
parent 43ec3ddbaf
commit d28008aa63
3 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/x.h
View File

@ -66,7 +66,7 @@ void x_draw_decoration(Con *con);
* It recursively traverses all children of the given node. * It recursively traverses all children of the given node.
* *
*/ */
void x_push_node(Con *con, bool skip_decoration); void x_push_node(Con *con);
/** /**
* Pushes all changes (state of each node, see x_push_node() and the window * Pushes all changes (state of each node, see x_push_node() and the window

2
src/floating.c
View File

@ -277,7 +277,7 @@ DRAGGING_CB(drag_window_callback) {
con->rect.y = old_rect->y + (new_y - event->root_y); con->rect.y = old_rect->y + (new_y - event->root_y);
render_con(con, false); render_con(con, false);
x_push_node(con, true); x_push_node(con);
xcb_flush(conn); xcb_flush(conn);
/* Check if we cross workspace boundaries while moving */ /* Check if we cross workspace boundaries while moving */

26
src/x.c
View File

@ -442,7 +442,7 @@ update_pixmaps:
* It recursively traverses all children of the given node. * It recursively traverses all children of the given node.
* *
*/ */
void x_push_node(Con *con, bool skip_decoration) { void x_push_node(Con *con) {
Con *current; Con *current;
con_state *state; con_state *state;
Rect rect = con->rect; Rect rect = con->rect;
@ -584,10 +584,25 @@ void x_push_node(Con *con, bool skip_decoration) {
* in focus order to display the focused client in a stack first when * in focus order to display the focused client in a stack first when
* switching workspaces (reduces flickering). */ * switching workspaces (reduces flickering). */
TAILQ_FOREACH(current, &(con->focus_head), focused) TAILQ_FOREACH(current, &(con->focus_head), focused)
x_push_node(current, skip_decoration); x_push_node(current);
}
if (!skip_decoration && /*
(con->type != CT_ROOT && con->type != CT_OUTPUT) && * Recursively calls x_draw_decoration. This cannot be done in x_push_node
* because x_push_node uses focus order to recurse (see the comment above)
* while drawing the decoration needs to happen in the actual order.
*
*/
static void x_deco_recurse(Con *con) {
Con *current;
TAILQ_FOREACH(current, &(con->nodes_head), nodes)
x_deco_recurse(current);
TAILQ_FOREACH(current, &(con->floating_head), floating_windows)
x_deco_recurse(current);
if ((con->type != CT_ROOT && con->type != CT_OUTPUT) &&
con->mapped) con->mapped)
x_draw_decoration(con); x_draw_decoration(con);
} }
@ -691,7 +706,8 @@ void x_push_changes(Con *con) {
DLOG("Done, EnterNotify re-enabled\n"); DLOG("Done, EnterNotify re-enabled\n");
DLOG("\n\n PUSHING CHANGES\n\n"); DLOG("\n\n PUSHING CHANGES\n\n");
x_push_node(con, false); x_push_node(con);
x_deco_recurse(con);
xcb_window_t to_focus = focused->frame; xcb_window_t to_focus = focused->frame;
if (focused->window != NULL) if (focused->window != NULL)