Skip to content

fix: prevent theme saving when DontSaveApplicationTheme is set #315

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
May 8, 2025
Merged

fix: prevent theme saving when DontSaveApplicationTheme is set #315

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
c3fb5d6
fix: prevent theme saving when DontSaveApplicationTheme is set
18202781743 May 8, 2025
a20487a
fix: correct bitwise operation in preference handling
18202781743 May 8, 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
3 changes: 2 additions & 1 deletion src/kernel/dguiapplicationhelper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1821,7 +1821,8 @@ void DGuiApplicationHelper::setPaletteType(DGuiApplicationHelper::ColorType pale

d->initPaletteType();
d->setPaletteType(paletteType, true);
_d_dconfig->setThemeType(static_cast<int>(paletteType));
if (!DGuiApplicationHelper::testAttribute(DGuiApplicationHelper::DontSaveApplicationTheme))
_d_dconfig->setThemeType(static_cast<int>(paletteType));
}

/*!
Expand Down
4 changes: 2 additions & 2 deletions src/kernel/orgdeepindtkpreference.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* This file is generated by dconfig2cpp.
* Command line arguments: ./build5/tools/dconfig2cpp/dconfig2cpp -c OrgDeepinDTKPreference /usr/share/dsg/configs/org.deepin.dtk.preference.json
* Generation time: 2025-05-06T19:45:14
* Generation time: 2025-05-08T17:31:56
* JSON file version: 1.0
*
* WARNING: DO NOT MODIFY THIS FILE MANUALLY.
Expand Down Expand Up @@ -711,7 +711,7 @@ class OrgDeepinDTKPreference : public QObject {
if (on)
m_propertySetStatus0.fetchAndOrOrdered(1 << (index - 0));
else
m_propertySetStatus0.fetchAndAndOrdered(1 << (index - 0));
m_propertySetStatus0.fetchAndAndOrdered(~(1 << (index - 0)));
return;
}
Q_UNREACHABLE();
Expand Down
Loading