Skip to content

Add Aligned edge stycky resize mode #621

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add Aligned edge stycky resize mode #621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff5e7b0
Add Aligned edge stycky resize mode
RamonUnch Jun 1, 2025
6f9e65a
add ctrl key to toggle new mode
RamonUnch Jun 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 53 additions & 17 deletions hooks.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ static struct config {
UCHAR Aero;
UCHAR SmartAero;
UCHAR StickyResize;
UCHAR StickyResizeMode;
UCHAR InactiveScroll;
UCHAR MDI;
UCHAR ResizeCenter;
Expand Down Expand Up @@ -281,6 +282,7 @@ static const struct OptionListItem General_uchars[] = {
{ "Aero", 1 },
{ "SmartAero", 1 },
{ "StickyResize", 0 },
{ "StickyResizeMode", 0 },
{ "InactiveScroll", 0 },
{ "MDI", 0 },
{ "ResizeCenter", 1 },
Expand Down Expand Up @@ -640,9 +642,11 @@ static void OffsetRectMDI(RECT *wnd)
static int ShouldSnapTo(HWND hwnd)
{
LONG_PTR style;
RECT rc;
return hwnd != state.hwnd
&& IsVisible(hwnd)
&& !IsIconic(hwnd)
&& (GetWindowRect(hwnd, &rc) && !IsRectEmpty(&rc) )
&& !(GetWindowLongPtr(hwnd, GWL_EXSTYLE)&WS_EX_NOACTIVATE) // != WS_EX_NOACTIVATE
&&( ((style=GetWindowLongPtr(hwnd, GWL_STYLE))&WS_CAPTION) == WS_CAPTION
|| (style&WS_THICKFRAME)
Expand Down Expand Up @@ -685,7 +689,7 @@ static DWORD WINAPI WorkerThread(LPVOID p)
break;
}
}
LOG("WM_DOMOUSEMOVE (%d,%d) skip_count = %d", msg.wParam, msg.lParam, skip_count);
LOG("WM_DOMOUSEMOVE hwnd=%x (%d,%d) skip_count = %d", (UINT)(INT_PTR)state.hwnd, msg.wParam, msg.lParam, skip_count);

POINT pt = { (long)msg.wParam, (long)msg.lParam };

Expand Down Expand Up @@ -811,7 +815,11 @@ BOOL CALLBACK EnumTouchingWindows(HWND hwnd, LPARAM lParam)
// touching the currently resized window
RECT statewnd;
GetWindowRectL(state.hwnd, &statewnd);
unsigned flag = AreRectsTouchingT(&statewnd, &wnd, conf.SnapThreshold/2);

unsigned flag = (conf.StickyResizeMode==1) ^ state.ctrl /* Aligned */
? AreRectsAligned2T(&statewnd, &wnd, conf.SnapThreshold/2)
: AreRectsTouchingT(&statewnd, &wnd, conf.SnapThreshold/2);

if (flag) {
OffsetRectMDI(&wnd);

Expand Down Expand Up @@ -867,6 +875,7 @@ static int ResizeTouchingWindows(LPVOID lwptr)
hwndSS = BeginDeferWindowPos(numsnwnds+1);
}
unsigned i;
//struct resizeXY rz = state.resize;
for (i=0; i < numsnwnds; i++) {
RECT *nwnd = &snwnds[i].wnd;
unsigned flag = snwnds[i].flag;
Expand All @@ -878,20 +887,49 @@ static int ResizeTouchingWindows(LPVOID lwptr)
if(!PtInRect(&state.origin.mon, tpt))
continue;

if (PureLeft(flag)) {
nwnd->right = posx;
} else if (PureRight(flag)) {
POINT Min, Max;
GetMinMaxInfo(hwnd, &Min, &Max);
nwnd->left = CLAMP(nwnd->right-Max.x, posx + width, nwnd->right-Min.x);
} else if (PureTop(flag)) {
nwnd->bottom = posy;
} else if (PureBottom(flag)) {
WORD ouflags = (flag&0x0000FFFFu);
WORD inflags = (flag&0xFFFF0000u)>>16;
if ((conf.StickyResizeMode == 1) ^ state.ctrl) {
/* All aligned edges (in and out) */
POINT Min, Max;
GetMinMaxInfo(hwnd, &Min, &Max);
nwnd->top = CLAMP(nwnd->bottom-Max.x, posy + height, nwnd->bottom-Min.x);

if (ouflags & SNLEFT)
nwnd->right = posx;
if (inflags & SNLEFT)
nwnd->left = posx;

if (ouflags & SNRIGHT)
nwnd->left = CLAMP(nwnd->right-Max.x, posx + width, nwnd->right-Min.x);
if (inflags & SNRIGHT)
nwnd->right = CLAMP(nwnd->left+Min.x, posx + width, nwnd->left+Max.x);

if (ouflags & SNTOP)
nwnd->bottom = posy;
if (inflags & SNTOP)
nwnd->top = posy;

if (ouflags & SNBOTTOM)
nwnd->top = CLAMP(nwnd->bottom-Max.y, posy + height, nwnd->bottom-Min.y);
if (inflags & SNBOTTOM)
nwnd->bottom = CLAMP(nwnd->top+Min.y, posy + height, nwnd->top+Max.y);
} else {
continue;
/* Only when touching from outside */
if (PureLeft(ouflags)) {
nwnd->right = posx;
} else if (PureRight(ouflags)) {
POINT Min, Max;
GetMinMaxInfo(hwnd, &Min, &Max);
nwnd->left = CLAMP(nwnd->right-Max.x, posx + width, nwnd->right-Min.x);
} else if (PureTop(ouflags)) {
nwnd->bottom = posy;
} else if (PureBottom(ouflags)) {
POINT Min, Max;
GetMinMaxInfo(hwnd, &Min, &Max);
nwnd->top = CLAMP(nwnd->bottom-Max.x, posy + height, nwnd->bottom-Min.x);
} else {
continue;
}
}
if (hwndSS) {
RECT nbd;
Expand Down Expand Up @@ -3699,10 +3737,8 @@ static void NextBorders(RECT *pos, const RECT *cur, const RECT *def)
if (flg&(SNZONE|SNBOTTOM) && rc->top > cur->bottom) pos->bottom = min(pos->bottom, rc->top);
}
}
#define SNTO_CNSNAP 0
#define SNTO_EXTEND 1
#define SNTO_NEXTBD 2
#define SNTO_MOVETO 4

enum { SNTO_CNSNAP=0, SNTO_EXTEND=1, SNTO_NEXTBD=2, SNTO_MOVETO=4 };
static void SnapToCorner(HWND hwnd, struct resizeXY resize, UCHAR flags)
{
// When trying to Snap or extend a non-resizeable window
Expand Down
15 changes: 14 additions & 1 deletion unfuck.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1473,13 +1473,26 @@ static pure int EqualRectT(const RECT *a, const RECT *b, const int T)
return IsEqualT(a->left, b->left, T) && IsEqualT(a->right, b->right, T)
&& IsEqualT(a->top, b->top, T) && IsEqualT(a->bottom, b->bottom, T);
}
static pure unsigned AreRectsAlignedT(const RECT *a, const RECT *b, const int tol)
static pure unsigned AreRectsAlignedOutT(const RECT *a, const RECT *b, const int tol)
{
return IsEqualT(a->left, b->right, tol) << 2
| IsEqualT(a->top, b->bottom, tol) << 4
| IsEqualT(a->right, b->left, tol) << 3
| IsEqualT(a->bottom, b->top, tol) << 5;
}
static pure unsigned AreRectsAlignedInT(const RECT *a, const RECT *b, const int tol)
{
return IsEqualT(a->left, b->left, tol) << 2
| IsEqualT(a->top, b->top, tol) << 4
| IsEqualT(a->right, b->right, tol) << 3
| IsEqualT(a->bottom, b->bottom, tol) << 5;
}
static pure unsigned AreRectsAligned2T(const RECT *a, const RECT *b, const int tol)
{
return AreRectsAlignedOutT(a, b, tol) | (AreRectsAlignedInT(b, a, tol) << 16);
}


static int InRange(int x, int a, int b)
{
return (x >= a) && (x <= b);
Expand Down