Skip to content

fix: skip inactive color when active and inactive colors are equal #573

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

Open
18202781743 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: skip inactive color when active and inactive colors are equal #573

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
14 changes: 12 additions & 2 deletions src/private/dquickcontrolpalette.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: 2020 - 2022 UnionTech Software Technology Co., Ltd.
// SPDX-FileCopyrightText: 2020 - 2026 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: LGPL-3.0-or-later

Expand Down Expand Up @@ -844,7 +844,17 @@ QColor DQuickControlColorSelector::getColorOf(const DQuickControlPalette *palett

// items with inactive state should use inactive color, it likes dtkgui's generatePaletteColor_helper.
static const auto useInactiveColor = DGuiApplicationHelper::testAttribute(DGuiApplicationHelper::UseInactiveColorGroup);
if (useInactiveColor && state->controlState == DQMLGlobalObject::InactiveState) {
bool shouldBlendInactive = useInactiveColor && state->controlState == DQMLGlobalObject::InactiveState;
if (shouldBlendInactive) {
if (m_control) {
// If the control's inactive palette is same as active palette, it means the control does not have a real
// inactive state, we should not blend the color with inactive mask color, otherwise it will cause the
// color looks like disabled and hard to recognize.
const auto qpalette = _d_getControlPalette(m_control);
shouldBlendInactive = !qpalette.isEqual(QPalette::Inactive, QPalette::Active);
}
}
if (shouldBlendInactive) {
const auto &palette = DGuiApplicationHelper::standardPalette(state->controlTheme);
const auto &windowColor = palette.color(QPalette::Window);

Expand Down