From aef3fdc8bc05160be55025d4991f36beb66131b6 Mon Sep 17 00:00:00 2001 From: Krister Jansson Date: Thu, 22 Nov 2018 21:54:57 +0100 Subject: [PATCH] Left- and Top padding --- src/main.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main.c b/src/main.c index ae6fb08..0a87993 100644 --- a/src/main.c +++ b/src/main.c @@ -15,7 +15,6 @@ #include #include -// TODO: Padding // TODO: Parameters for padding and alignment // TODO: Align bottom, not top! // TODO: Readme.md @@ -57,6 +56,8 @@ short StringEndsWith(const char *str, const char *suffix); void StringToLower(char *str, unsigned int strLen, unsigned int offset); // Icon alignment +long LeftPadding = 4; +long TopPadding = 4; long XAlignment = 16; long YAlignment = 16; unsigned int AlignCurrentWorkingDir(); @@ -319,8 +320,8 @@ unsigned int AlignIcon(unsigned char *diskObjectName) short xaligned = FALSE; if (diskObject->do_CurrentX != NO_ICON_POSITION) { - long currx = diskObject->do_CurrentX + (XAlignment / 2); - long newx = currx - (currx % XAlignment); + long currx = (diskObject->do_CurrentX - LeftPadding) + (XAlignment / 2); + long newx = LeftPadding + currx - (currx % XAlignment); if (newx != diskObject->do_CurrentX) { xaligned = TRUE; @@ -330,8 +331,8 @@ unsigned int AlignIcon(unsigned char *diskObjectName) short yaligned = FALSE; if (diskObject->do_CurrentY != NO_ICON_POSITION) { - long curry = diskObject->do_CurrentY + (YAlignment / 2); - long newy = curry - (curry % YAlignment); + long curry = (diskObject->do_CurrentY -TopPadding) + (YAlignment / 2); + long newy = TopPadding + curry - (curry % YAlignment); if (newy != diskObject->do_CurrentY) { yaligned = TRUE;