Skip to content

fix: deepinwmfaker read error file #106

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: deepinwmfaker read error file #106

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
569f8d8
fix: deepinwmfaker read error file
wineee Mar 6, 2024
a916b8a
chore: bump version to 1.1.26
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 @@
dde-appearance (1.1.26) unstable; urgency=medium

* fix: deepinwmfaker read error cursorSize

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

dde-appearance (1.1.25) unstable; urgency=medium

* feat: add signal for deepin fakewm
Expand Down
9 changes: 5 additions & 4 deletions fakewm/dbus/deepinwmfaker.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,19 +442,20 @@ bool DeepinWMFaker::zoneEnabled() const

QString DeepinWMFaker::cursorTheme() const
{
KConfigGroup mousecfg(KSharedConfig::openConfig("deepin-kcminputrc", KConfig::NoGlobals), "Mouse");
KConfigGroup mousecfg(KSharedConfig::openConfig("kcminputrc", KConfig::NoGlobals), "Mouse");
const QString themeName = mousecfg.readEntry("cursorTheme", "default");

return themeName;
}

int DeepinWMFaker::cursorSize() const
{
KConfigGroup mousecfg(KSharedConfig::openConfig("deepin-kcminputrc", KConfig::NoGlobals), "Mouse");
KConfigGroup mousecfg(KSharedConfig::openConfig("kcminputrc", KConfig::NoGlobals), "Mouse");
bool ok = false;
int themeSize = mousecfg.readEntry("cursorSize", QString("0")).toInt(&ok);
// The default Xcursor theme size of deepin-kwin is 24
int themeSize = mousecfg.readEntry("cursorSize", QString("24")).toInt(&ok);

return ok ? themeSize : -1;
return ok ? themeSize : 24;
}

#ifndef DISABLE_DEEPIN_WM
Expand Down