Skip to content

Commit

Permalink
checkPanFrames: don't clobber mapped state
Browse files Browse the repository at this point in the history
When checking to see what needs to be done with pan frames, the check to
see whether the desktop is in global mode or not, would always force
certain panframes to be unmapped, even if we shouldn't.

Fixes #543
  • Loading branch information
ThomasAdam committed Jun 21, 2021
1 parent 806029c commit 61308d7
Showing 1 changed file with 12 additions and 11 deletions.
23 changes: 12 additions & 11 deletions fvwm/virtual.c
Original file line number Diff line number Diff line change
Expand Up @@ -1083,6 +1083,18 @@ void checkPanFrames(struct monitor *m)
do_unmap_b = true;
}

/* Remove panframes if in global mode and on inside edge */
if (global) {
if (m->edge.left)
do_unmap_l = true;
if (m->edge.right)
do_unmap_r = true;
if (m->edge.bottom)
do_unmap_b = true;
if (m->edge.top)
do_unmap_t = true;
}

/* correct the unmap variables if pan frame commands are set */
if (edge_thickness != 0) {
if (m->PanFrameLeft.command != NULL ||
Expand All @@ -1102,17 +1114,6 @@ void checkPanFrames(struct monitor *m)
do_unmap_t = false;
}
}
/* Remove panframes if in global mode and on inside edge */
if (global) {
if (m->edge.left)
do_unmap_l = true;
if (m->edge.right)
do_unmap_r = true;
if (m->edge.bottom)
do_unmap_b = true;
if (m->edge.top)
do_unmap_t = true;
}

/*
* hide or show the windows
Expand Down

0 comments on commit 61308d7

Please sign in to comment.