Skip to content

Commit

Permalink
Revert "Fixed standard drag routine so it no longer crashes when Dopus5"
Browse files Browse the repository at this point in the history
This reverts commit 6c10750.

This fixes an issue with drag & drop where the dragged icon will just
be left wherever the drag ended (even if the drag was canceled), leaving
corrupted backdrops and windows behind.

The original commit moved the call to DrawDragList (and ultimately DrawGList)
_before_ the call to RemBob. But DrawGList needs to be called _after) RemBob
to fully remove the Bob from the screen.

The original commit was a fix for OS4, but here we only care about OS3,
so just revert it and be happy.
  • Loading branch information
mheyer32 committed May 17, 2020
1 parent a55fcb3 commit 4ad430f
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions source/Program/backdrop_drag.c
Original file line number Diff line number Diff line change
Expand Up @@ -198,10 +198,6 @@ BOOL backdrop_stop_drag(BackdropInfo *info)
// Get stop time
CurrentTime(&sec,&mic);

// Draw GELs list
SortGList(&GUI->drag_screen_rp);
DrawDragList(&GUI->drag_screen_rp,&info->window->WScreen->ViewPort,(info->flags&BDIF_CUSTOM_DRAG)?DRAGF_CUSTOM|DRAGF_REMOVE:0);

// Normal dragging?
if (!(info->flags&BDIF_CUSTOM_DRAG))
{
Expand All @@ -219,6 +215,10 @@ BOOL backdrop_stop_drag(BackdropInfo *info)
}
}

// Draw GELs list
SortGList(&GUI->drag_screen_rp);
DrawDragList(&GUI->drag_screen_rp,&info->window->WScreen->ViewPort,(info->flags&BDIF_CUSTOM_DRAG)?DRAGF_CUSTOM|DRAGF_REMOVE:0);

// Clear drag flag
GUI->flags&=~GUIF_DRAGGING;

Expand Down

0 comments on commit 4ad430f

Please sign in to comment.