-
-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Implement programmatic SnapAssist for v3 #4459
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.
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
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -133,3 +133,4 @@ func (wm *WindowManager) GetAll() []Window { | |
| } | ||
| return windows | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| //go:build darwin | ||
|
|
||
| package application | ||
|
|
||
| // showSnapAssist is a no-op on macOS as SnapAssist is a Windows-only feature | ||
| func showSnapAssist(window *WebviewWindow) { | ||
| // SnapAssist is not available on macOS | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| //go:build linux | ||
|
|
||
| package application | ||
|
|
||
| // showSnapAssist is a no-op on Linux as SnapAssist is a Windows-only feature | ||
| func showSnapAssist(window *WebviewWindow) { | ||
| // SnapAssist is not available on Linux | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| //go:build windows | ||
|
|
||
| package application | ||
|
|
||
| import ( | ||
| "time" | ||
| "unsafe" | ||
|
|
||
| "github.com/wailsapp/wails/v3/pkg/w32" | ||
| ) | ||
|
|
||
| // showSnapAssist sends Win+Z key combination to trigger SnapAssist for the specified window | ||
| func showSnapAssist(window *WebviewWindow) { | ||
| // First, ensure the window is visible and focused to target SnapAssist correctly | ||
| window.Show() // Ensure window is visible | ||
| window.Restore() // Restore if minimized | ||
|
|
||
| // Get the native window handle and set it as foreground | ||
| if hwnd := w32.HWND(window.impl.nativeWindowHandle()); hwnd != 0 { | ||
| w32.SetForegroundWindow(hwnd) | ||
| // Small delay to ensure window focus is established | ||
| time.Sleep(50 * time.Millisecond) | ||
| } | ||
|
|
||
| // Send Win+Z key combination using a robotgo-style approach | ||
| sendKeyCombo(w32.VK_Z, w32.VK_LWIN) | ||
| } | ||
|
|
||
| // sendKeyCombo sends a key combination (key + modifiers) | ||
| func sendKeyCombo(key uint16, modifiers ...uint16) { | ||
| // Calculate total inputs needed (press and release for each key) | ||
| numKeys := len(modifiers) + 1 | ||
| inputs := make([]w32.INPUT, numKeys*2) | ||
|
|
||
| inputIndex := 0 | ||
|
|
||
| // Press all modifier keys first | ||
| for _, modifier := range modifiers { | ||
| inputs[inputIndex] = w32.INPUT{ | ||
| Type: w32.INPUT_KEYBOARD, | ||
| Ki: w32.KEYBDINPUT{ | ||
| WVk: modifier, | ||
| WScan: 0, | ||
| DwFlags: 0, | ||
| Time: 0, | ||
| DwExtraInfo: 0, | ||
| }, | ||
| } | ||
| inputIndex++ | ||
| } | ||
|
|
||
| // Press the main key | ||
| inputs[inputIndex] = w32.INPUT{ | ||
| Type: w32.INPUT_KEYBOARD, | ||
| Ki: w32.KEYBDINPUT{ | ||
| WVk: key, | ||
| WScan: 0, | ||
| DwFlags: 0, | ||
| Time: 0, | ||
| DwExtraInfo: 0, | ||
| }, | ||
| } | ||
| inputIndex++ | ||
|
|
||
| // Release the main key | ||
| inputs[inputIndex] = w32.INPUT{ | ||
| Type: w32.INPUT_KEYBOARD, | ||
| Ki: w32.KEYBDINPUT{ | ||
| WVk: key, | ||
| WScan: 0, | ||
| DwFlags: w32.KEYEVENTF_KEYUP, | ||
| Time: 0, | ||
| DwExtraInfo: 0, | ||
| }, | ||
| } | ||
| inputIndex++ | ||
|
|
||
| // Release all modifier keys in reverse order | ||
| for i := len(modifiers) - 1; i >= 0; i-- { | ||
| inputs[inputIndex] = w32.INPUT{ | ||
| Type: w32.INPUT_KEYBOARD, | ||
| Ki: w32.KEYBDINPUT{ | ||
| WVk: modifiers[i], | ||
| WScan: 0, | ||
| DwFlags: w32.KEYEVENTF_KEYUP, | ||
| Time: 0, | ||
| DwExtraInfo: 0, | ||
| }, | ||
| } | ||
| inputIndex++ | ||
| } | ||
|
|
||
| // Send all input events | ||
| w32.SendInput(len(inputs), unsafe.Pointer(&inputs[0]), int(unsafe.Sizeof(w32.INPUT{}))) | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🛠️ Refactor suggestion
Address code duplication between files.
There are now two different implementations of
sendKeyCombo():webview_window_windows.go(lines 2293-2348) supporting only one modifierConsider consolidating to avoid duplication:
sendKeyCombomethod fromwebview_window_windows.goshowSnapAssistmethod inwebview_window_windows.goto call this functionThis would eliminate code duplication and ensure consistent behavior across the codebase.
🤖 Prompt for AI Agents