From a997825148a2076e5f6c1ccfe5b268f5cb82142c Mon Sep 17 00:00:00 2001 From: dan Date: Thu, 22 Apr 1999 03:33:54 +0000 Subject: [PATCH] Some cleanup in the dock.c code. --- src/dock.c | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/src/dock.c b/src/dock.c index 9e52090d..80f3f3aa 100644 --- a/src/dock.c +++ b/src/dock.c @@ -2383,7 +2383,7 @@ wDockSnapIcon(WDock *dock, WAppIcon *icon, int req_x, int req_y, if (ex_y>=0 && ex_y<=max_y_icons && (aicon==icon || !aicon)) { *ret_x = 0; - *ret_y = ex_y; + *ret_y = ex_y; return True; } @@ -2420,16 +2420,16 @@ wDockSnapIcon(WDock *dock, WAppIcon *icon, int req_x, int req_y, || (ex_y < closest && closest - ex_y <= DOCK_DETTACH_THRESHOLD+1))) { *ret_x = 0; - *ret_y = closest; - return True; + *ret_y = closest; + return True; } } else { /* !redocking */ /* if slot is free and the icon is close enough, return it */ if (!aicon && ex_x == 0 && ex_y >= 0 && ex_y <= max_y_icons) { *ret_x = 0; - *ret_y = ex_y; - return True; + *ret_y = ex_y; + return True; } } } else { /* CLIP */ @@ -3645,25 +3645,11 @@ handleIconMove(WDock *dock, WAppIcon *aicon, XEvent *event) if (!ondock) { XMapWindow(dpy, scr->dock_shadow); -#if 0 - if (!collapsed && (collapsed = last_dock->collapsed)) { - last_dock->collapsed = 0; - wDockShowIcons(last_dock); - } -#endif } ondock = 1; } else { if (ondock) { XUnmapWindow(dpy, scr->dock_shadow); -#if 0 - if (last_dock && collapsed && - aicon->running && (ev.xmotion.state & MOD_MASK)) { - last_dock->collapsed = 1; - wDockHideIcons(last_dock); - collapsed = 0; - } -#endif } ondock = 0; }