Skip to content

fix: Prevent terminal theme from being changed by other applications #545

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 1 commit into from
Jun 23, 2026
Merged

fix: Prevent terminal theme from being changed by other applications #545

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 18 additions & 1 deletion src/settings/settings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (C) 2019 ~ 2020 Uniontech Software Technology Co.,Ltd
// Copyright (C) 2019 ~ 2026 Uniontech Software Technology Co.,Ltd
// SPDX-FileCopyrightText: 2022 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later
Expand Down Expand Up @@ -150,6 +150,23 @@ void Settings::init()
setColorScheme(sysTheme);
}
}

// 按 colorScheme 对齐 paletteType，激活 dtkgui 的 isCustomPalette() 过滤，
// 避免外部应用切主题时 dde-appearance 经 DPlatformTheme 把 palette 推送到本进程 qApp。
// 跟随系统模式（extendColorScheme 为空且 paletteType 为 UnknownType）保持原状。
{
auto helper = DGuiApplicationHelper::instance();
const bool isFollowSystem = extendColorScheme().isEmpty()
&& helper->paletteType() == DGuiApplicationHelper::UnknownType;
if (!isFollowSystem) {
const auto desiredType = (colorScheme() == "Light")
? DGuiApplicationHelper::LightType
: DGuiApplicationHelper::DarkType;
if (helper->paletteType() != desiredType) {
helper->setPaletteType(desiredType);
}
}
}
/******** Modify by n014361 wangpeili 2020-01-10: 增加窗口状态选项 ************/
auto windowState = settings->option("advanced.window.use_on_starting");
QMap<QString, QVariant> windowStateMap;
Expand Down
Loading