gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 12:28:22 +01:00
Code Issues Projects Releases Wiki Activity

Fixed a bug with icon position calculation when redocking in clip,

Browse Source 
and made libwmfun to be added to distribution with "make dist".
This commit is contained in:
dan
1999-04-22 03:25:30 +00:00
parent 2a19d45517
commit dfbc246a3f
4 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -1,3 +1,10 @@
Changes since version 0.53.0:
.............................
- fixed a bug that caused icon overlaping in Clip, when icon was moved around.
- this time really added libwmfun to distribution.
Changes since version 0.52.0: Changes since version 0.52.0:
............................. .............................

2
Makefile.am
View File

@@ -5,7 +5,7 @@ SUBDIRS = wrlib WINGs src util po WindowMaker wmlib test WPrefs.app doc
EXTRA_DIST = TODO BUGS BUGFORM FAQ FAQ.I18N MIRRORS COPYING.OPL \ EXTRA_DIST = TODO BUGS BUGFORM FAQ FAQ.I18N MIRRORS COPYING.OPL \
Install acconfig.h\ Install acconfig.h\
mkpatch README.KDE README.GNOME WindowMaker.lsm.in\ mkpatch README.KDE README.GNOME WindowMaker.lsm.in\
docklib-0.2.tar.gz docklib-0.2.tar.gz libwmfun-0.0.1.tar.gz
WindowMaker.lsm: WindowMaker.lsm.in WindowMaker.lsm: WindowMaker.lsm.in
size=`wc -c $(distdir).tar.gz|cut -d\ -f1`;\ size=`wc -c $(distdir).tar.gz|cut -d\ -f1`;\

2
Makefile.in
View File

@@ -90,7 +90,7 @@ wprefsdir = @wprefsdir@
SUBDIRS = wrlib WINGs src util po WindowMaker wmlib test WPrefs.app doc SUBDIRS = wrlib WINGs src util po WindowMaker wmlib test WPrefs.app doc
EXTRA_DIST = TODO BUGS BUGFORM FAQ FAQ.I18N MIRRORS COPYING.OPL Install acconfig.h mkpatch README.KDE README.GNOME WindowMaker.lsm.in docklib-0.2.tar.gz EXTRA_DIST = TODO BUGS BUGFORM FAQ FAQ.I18N MIRRORS COPYING.OPL Install acconfig.h mkpatch README.KDE README.GNOME WindowMaker.lsm.in docklib-0.2.tar.gz libwmfun-0.0.1.tar.gz
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

18
src/dock.c
View File

@@ -2307,6 +2307,9 @@ wDockDetach(WDock *dock, WAppIcon *icon)
* coordinates. * coordinates.
* *
* Returns False if icon can't be docked. * Returns False if icon can't be docked.
*
* Note: this function should NEVER alter ret_x or ret_y, unless it will
* return True. -Dan
*/ */
Bool Bool
wDockSnapIcon(WDock *dock, WAppIcon *icon, int req_x, int req_y, wDockSnapIcon(WDock *dock, WAppIcon *icon, int req_x, int req_y,
@@ -2365,8 +2368,6 @@ wDockSnapIcon(WDock *dock, WAppIcon *icon, int req_x, int req_y,
} }
} }
*ret_x = 0;
if (redocking) { if (redocking) {
int sig, done, closest; int sig, done, closest;
@@ -2380,11 +2381,9 @@ wDockSnapIcon(WDock *dock, WAppIcon *icon, int req_x, int req_y,
if (abs(ex_x) > DOCK_DETTACH_THRESHOLD) if (abs(ex_x) > DOCK_DETTACH_THRESHOLD)
return False; return False;
if (ex_y >= 0 && ex_y <= max_y_icons && (aicon == icon || !aicon)) { 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; return True;
} }
@@ -2420,15 +2419,15 @@ wDockSnapIcon(WDock *dock, WAppIcon *icon, int req_x, int req_y,
((ex_y >= closest && ex_y - closest < DOCK_DETTACH_THRESHOLD+1) ((ex_y >= closest && ex_y - closest < DOCK_DETTACH_THRESHOLD+1)
|| ||
(ex_y < closest && closest - ex_y <= DOCK_DETTACH_THRESHOLD+1))) { (ex_y < closest && closest - ex_y <= DOCK_DETTACH_THRESHOLD+1))) {
*ret_x = 0;
*ret_y = closest; *ret_y = closest;
return True; return True;
} }
} else { /* !redocking */ } else { /* !redocking */
/* if slot is free and the icon is close enough, return it */ /* 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) { if (!aicon && ex_x == 0 && ex_y >= 0 && ex_y <= max_y_icons) {
*ret_x = 0;
*ret_y = ex_y; *ret_y = ex_y;
return True; return True;
} }
@@ -3618,8 +3617,7 @@ handleIconMove(WDock *dock, WAppIcon *aicon, XEvent *event)
if (dock->auto_raise_lower) if (dock->auto_raise_lower)
wDockRaise(dock); wDockRaise(dock);
last_dock = dock; last_dock = dock;
} } else if (dock2) {
else if (dock2) {
tmp = wDockSnapIcon(dock2, aicon, x, y, &ix, &iy, False); tmp = wDockSnapIcon(dock2, aicon, x, y, &ix, &iy, False);
if (tmp) { if (tmp) {
change_dock = 1; change_dock = 1;