Skip to content

Commit

Permalink
FvwmPager Bugfix: Fix UseSkipList
Browse files Browse the repository at this point in the history
  The logic for testing for this got lost in a previous commit.
  Adding it back. This fixes #1000.
  • Loading branch information
somiaj authored and ThomasAdam committed Apr 7, 2024
1 parent 7920b0f commit 380b8fd
Showing 1 changed file with 13 additions and 6 deletions.
19 changes: 13 additions & 6 deletions modules/FvwmPager/x_pager.c
Original file line number Diff line number Diff line change
Expand Up @@ -2269,18 +2269,25 @@ void AddNewWindow(PagerWindow *t)
void ChangeDeskForWindow(PagerWindow *t, long newdesk)
{
t->desk = newdesk;
newdesk -= desk1;

/* Hide windows outside of desk range on desk 0. */
if (newdesk < desk1 || newdesk > desk2)
if (newdesk < 0 || newdesk >= ndesks)
{
XReparentWindow(dpy, t->PagerView, Desks[0].w, -32768, -32768);
XReparentWindow(dpy, t->PagerView,
Desks[0].w, -32768, -32768);
HideWindow(t, t->IconView);
}
else if (UseSkipList && DO_SKIP_WINDOW_LIST(t))
{
XReparentWindow(dpy, t->PagerView,
Desks[newdesk].w, -32768, -32768);
HideWindow(t, t->IconView);
}
else
{
int desk = newdesk - desk1;
XReparentWindow(dpy, t->PagerView, Desks[desk].w,
t->pager_view.x, t->pager_view.y);
XReparentWindow(dpy, t->PagerView, Desks[newdesk].w,
t->pager_view.x, t->pager_view.y);
MoveResizeWindow(t, true, true);
}

Expand All @@ -2291,7 +2298,7 @@ void MoveResizePagerView(PagerWindow *t, bool do_force_redraw)
{
struct fpmonitor *fp = fpmonitor_this(t->m);

if (fp == NULL)
if (fp == NULL || (UseSkipList && DO_SKIP_WINDOW_LIST(t)))
{
HideWindow(t, None);
return;
Expand Down

0 comments on commit 380b8fd

Please sign in to comment.