Skip to content

fix: also set cursorSize for deepin-kwin #254

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
deepin-bot merged 2 commits into from
Mar 11, 2024
Merged

fix: also set cursorSize for deepin-kwin #254

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
85eb668
fix: also set cursorSize for deepin-kwin
wineee Mar 6, 2024
af7a49c
chore: release startdde 6.0.14
wineee Mar 7, 2024
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
6 changes: 6 additions & 0 deletions debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
startdde (6.0.14) unstable; urgency=medium

* fix: never set cursorSize for deepin-kwin

-- rewine <luhongxu@deepin.org> Thu, 07 Mar 2024 10:47:55 +0800

startdde (6.0.13) unstable; urgency=medium

fix: export proxy env error
Expand Down
12 changes: 11 additions & 1 deletion xsettings/scale.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,17 @@ func (m *XSManager) setScaleFactor(scale float64, emitSignal bool) {
gsWrapGDI.SetInt("cursor-size", cursorSize)
gsWrapGDI.Unref()

// set cursor size for deepin-kwin
conn, err := dbus.SessionBus()
if err != nil {
logger.Warning(err)
} else {
if err := conn.Object("com.deepin.wm",
"/com/deepin/wm").SetProperty("com.deepin.wm.cursorSize", dbus.MakeVariant(cursorSize)); err != nil {
logger.Warning(err)
}
}

m.emitSignalSetScaleFactor(true, emitSignal)
}

Expand Down Expand Up @@ -280,7 +291,6 @@ func (m *XSManager) getScreenScaleFactors() map[string]float64 {
return parseScreenFactors(factorsJoined)
}


func (m *XSManager) emitSignalSetScaleFactor(done, emitSignal bool) {
if !emitSignal {
return
Expand Down