Skip to content

Use Scaled Monitor Size For Monitor Detection #5802

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

Merged
andydotxyz merged 3 commits into from
Jul 11, 2025
Merged

Use Scaled Monitor Size For Monitor Detection #5802

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1e31a42
Use Scaled Monitor Size For Monitor Detection
cwarden Jun 23, 2025
7dd0e39
Move Calculation of Scale For a Monitor Into getMonitorScale Function
cwarden Jun 24, 2025
fc67f02
Make Scaled Monitor Size a fyne.Size
cwarden Jul 9, 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
32 changes: 24 additions & 8 deletions internal/driver/glfw/window_desktop.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,26 @@ func (w *window) fitContent() {
}
}

// getMonitorScale returns the scale factor for a given monitor, handling platform-specific cases
func getMonitorScale(monitor *glfw.Monitor) float32 {
widthMm, heightMm := monitor.GetPhysicalSize()
if runtime.GOOS == "linux" && widthMm == 60 && heightMm == 60 { // Steam Deck incorrectly reports 6cm square!
return 1.0
}
widthPx := monitor.GetVideoMode().Width
return calculateDetectedScale(widthMm, widthPx)
}

// getScaledMonitorSize returns the monitor dimensions adjusted for scaling
func getScaledMonitorSize(monitor *glfw.Monitor) fyne.Size {
videoMode := monitor.GetVideoMode()
scale := getMonitorScale(monitor)

scaledWidth := float32(videoMode.Width) / scale
scaledHeight := float32(videoMode.Height) / scale
return fyne.NewSize(scaledWidth, scaledHeight)
}

func (w *window) getMonitorForWindow() *glfw.Monitor {
if !build.IsWayland {
x, y := w.xpos, w.ypos
Expand All @@ -276,7 +296,9 @@ func (w *window) getMonitorForWindow() *glfw.Monitor {
if x > xOff || y > yOff {
continue
}
if videoMode := monitor.GetVideoMode(); x+videoMode.Width <= xOff || y+videoMode.Height <= yOff {

scaledSize := getScaledMonitorSize(monitor)
if x+int(scaledSize.Width) <= xOff || y+int(scaledSize.Height) <= yOff {
continue
}

Expand Down Expand Up @@ -309,13 +331,7 @@ func (w *window) detectScale() float32 {
return 1
}

widthMm, heightMm := monitor.GetPhysicalSize()
if runtime.GOOS == "linux" && widthMm == 60 && heightMm == 60 { // Steam Deck incorrectly reports 6cm square!
return 1
}
widthPx := monitor.GetVideoMode().Width

return calculateDetectedScale(widthMm, widthPx)
return getMonitorScale(monitor)
}

func (w *window) moved(_ *glfw.Window, x, y int) {
Expand Down
Loading