mirror of
https://github.com/wailsapp/wails.git
synced 2026-03-15 23:25:49 +01:00
* Refactor Manager API to use singular naming convention This is a RENAME-ONLY exercise that converts the Wails v3 Manager API from plural to singular naming for better consistency and clarity. ## Changes Applied ### API Transformations: - `app.Windows.*` → `app.Window.*` - `app.Events.*` → `app.Event.*` - `app.ContextMenus.*` → `app.ContextMenu.*` - `app.KeyBindings.*` → `app.KeyBinding.*` - `app.Dialogs.*` → `app.Dialog.*` - `app.Menus.*` → `app.Menu.*` - `app.Screens.*` → `app.Screen.*` ### Files Updated: - **Core Application**: 22 files in `v3/pkg/application/` - **Examples**: 43+ files in `v3/examples/` - **Documentation**: 13 files in `docs/src/content/docs/` - **CLI Tests**: 1 file in `v3/internal/commands/` ### Critical Constraints Preserved: - ✅ Event string constants unchanged (e.g., "windows:WindowShow") - ✅ Platform event names preserved (events.Windows, events.Mac, etc.) - ✅ TypeScript API remains compatible - ✅ All functionality intact ### Verification: - ✅ All examples build successfully (`task test:examples` passes) - ✅ Application package compiles without errors - ✅ Documentation reflects new API patterns ## Benefits - **Improved Clarity**: Singular names are more intuitive (`app.Window` vs `app.Windows`) - **Better Consistency**: Aligns with Go naming conventions - **Enhanced Developer Experience**: Clearer autocomplete and API discovery 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * Fix generator testcases and add cross-platform test cleanup - Update 28 generator testcase files to use singular API (app.Window.New() vs app.Windows.New()) - Add cross-platform cleanup system with Go script to remove test artifacts - Add test:all task with comprehensive testing and automatic cleanup - Fix cleanup to target files vs directories correctly (preserves source directories) 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> * Fix remaining Windows CI failures by updating all plural API usage to singular Fixed the last remaining instances of old plural Manager API usage: - tests/window-visibility-test/main.go: Updated all app.Windows -> app.Window and app.Menus -> app.Menu - internal/templates/_common/main.go.tmpl: Updated app.Windows -> app.Window and app.Events -> app.Event - pkg/services/badge/badge_windows.go: Updated app.Windows -> app.Window (Windows-specific fix) These fixes address the Windows CI failures where platform-specific files still used the old API. The tests didn't catch this locally because Windows-specific files only compile on Windows. 🤖 Generated with [Claude Code](https://claude.ai/code) Co-Authored-By: Claude <noreply@anthropic.com> --------- Co-authored-by: Claude <noreply@anthropic.com>
88 lines
2.5 KiB
Go
88 lines
2.5 KiB
Go
//go:build windows
|
|
|
|
package application
|
|
|
|
import (
|
|
"errors"
|
|
"strconv"
|
|
|
|
"github.com/wailsapp/wails/v3/pkg/w32"
|
|
"golang.org/x/sys/windows"
|
|
)
|
|
|
|
func (m *windowsApp) processAndCacheScreens() error {
|
|
allScreens, err := w32.GetAllScreens()
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// Convert result to []*Screen
|
|
var screens []*Screen
|
|
|
|
for _, screen := range allScreens {
|
|
x := int(screen.MONITORINFOEX.RcMonitor.Left)
|
|
y := int(screen.MONITORINFOEX.RcMonitor.Top)
|
|
right := int(screen.MONITORINFOEX.RcMonitor.Right)
|
|
bottom := int(screen.MONITORINFOEX.RcMonitor.Bottom)
|
|
width := right - x
|
|
height := bottom - y
|
|
|
|
workArea := Rect{
|
|
X: int(screen.MONITORINFOEX.RcWork.Left),
|
|
Y: int(screen.MONITORINFOEX.RcWork.Top),
|
|
Width: int(screen.MONITORINFOEX.RcWork.Right - screen.MONITORINFOEX.RcWork.Left),
|
|
Height: int(screen.MONITORINFOEX.RcWork.Bottom - screen.MONITORINFOEX.RcWork.Top),
|
|
}
|
|
|
|
screens = append(screens, &Screen{
|
|
ID: hMonitorToScreenID(screen.HMonitor),
|
|
Name: windows.UTF16ToString(screen.MONITORINFOEX.SzDevice[:]),
|
|
X: x,
|
|
Y: y,
|
|
Size: Size{Width: width, Height: height},
|
|
Bounds: Rect{X: x, Y: y, Width: width, Height: height},
|
|
PhysicalBounds: Rect{X: x, Y: y, Width: width, Height: height},
|
|
WorkArea: workArea,
|
|
PhysicalWorkArea: workArea,
|
|
IsPrimary: screen.IsPrimary,
|
|
ScaleFactor: screen.ScaleFactor,
|
|
Rotation: 0,
|
|
})
|
|
}
|
|
|
|
err = m.parent.Screen.LayoutScreens(screens)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// NOTE: should be moved to *App after DPI is implemented in all platforms
|
|
func (m *windowsApp) getScreens() ([]*Screen, error) {
|
|
return m.parent.Screen.screens, nil
|
|
}
|
|
|
|
// NOTE: should be moved to *App after DPI is implemented in all platforms
|
|
func (m *windowsApp) getPrimaryScreen() (*Screen, error) {
|
|
return m.parent.Screen.primaryScreen, nil
|
|
}
|
|
|
|
func getScreenForWindow(window *windowsWebviewWindow) (*Screen, error) {
|
|
return ScreenNearestPhysicalRect(window.physicalBounds()), nil
|
|
}
|
|
|
|
func getScreenForWindowHwnd(hwnd w32.HWND) (*Screen, error) {
|
|
hMonitor := w32.MonitorFromWindow(hwnd, w32.MONITOR_DEFAULTTONEAREST)
|
|
screenID := hMonitorToScreenID(hMonitor)
|
|
for _, screen := range globalApplication.Screen.screens {
|
|
if screen.ID == screenID {
|
|
return screen, nil
|
|
}
|
|
}
|
|
return nil, errors.New("screen not found for window")
|
|
}
|
|
|
|
func hMonitorToScreenID(hMonitor uintptr) string {
|
|
return strconv.Itoa(int(hMonitor))
|
|
}
|