diff --git a/app/internal/window/egl_windows.go b/app/internal/window/egl_windows.go index ac0aa76d..d1d88812 100644 --- a/app/internal/window/egl_windows.go +++ b/app/internal/window/egl_windows.go @@ -52,7 +52,7 @@ func mustLoadDLL(dll *syscall.LazyDLL, name string) { if loadErr == nil { return } - pmsg := syscall.StringToUTF16Ptr("Failed to load " + name+ ". Gio requires the ANGLE OpenGL ES driver to run. A prebuilt version can be downloaded from https://gioui.org/doc/install.") + pmsg := syscall.StringToUTF16Ptr("Failed to load " + name + ". Gio requires the ANGLE OpenGL ES driver to run. A prebuilt version can be downloaded from https://gioui.org/doc/install.") ptitle := syscall.StringToUTF16Ptr("Error") syscall.MessageBox(0 /* HWND */, pmsg, ptitle, syscall.MB_ICONERROR|syscall.MB_SYSTEMMODAL) os.Exit(1) diff --git a/app/internal/window/os_wayland.go b/app/internal/window/os_wayland.go index 0939409e..90f01c3e 100644 --- a/app/internal/window/os_wayland.go +++ b/app/internal/window/os_wayland.go @@ -1071,17 +1071,17 @@ func (w *window) surface() (*C.struct_wl_surface, int, int) { func (w *window) ShowTextInput(show bool) {} -// detectFontScale reports current font scale, or 1.0 +// detectFontScale reports the system font scale, or monitorScale // if it fails. func detectFontScale() float32 { // TODO: What about other window environments? out, err := exec.Command("gsettings", "get", "org.gnome.desktop.interface", "text-scaling-factor").Output() if err != nil { - return 1.0 + return monitorScale } scale, err := strconv.ParseFloat(string(bytes.TrimSpace(out)), 32) if err != nil { - return 1.0 + return monitorScale } return float32(scale) }