Skip to content

sync: from linuxdeepin/dtkdeclarative #303

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
18202781743 merged 1 commit into from
Sep 22, 2025
Merged

sync: from linuxdeepin/dtkdeclarative #303

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
11 changes: 11 additions & 0 deletions src/private/dquickcontrolpalette.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -842,6 +842,17 @@ QColor DQuickControlColorSelector::getColorOf(const DQuickControlPalette *palett
colorValue = QColor(255 - r, 255 - g, 255 - b, a);
}

// items with inactive state should use inactive color, it likes dtkgui's generatePaletteColor_helper.
static const auto useInactiveColor = DGuiApplicationHelper::testAttribute(DGuiApplicationHelper::UseInactiveColorGroup);
Copy link

@sourcery-ai sourcery-ai bot Sep 22, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suggestion: Consider whether static const is appropriate for useInactiveColor.

If the application's attribute can change at runtime, use a local variable instead to ensure the value is always current.

Suggested change
static const auto useInactiveColor = DGuiApplicationHelper::testAttribute(DGuiApplicationHelper::UseInactiveColorGroup);
const auto useInactiveColor = DGuiApplicationHelper::testAttribute(DGuiApplicationHelper::UseInactiveColorGroup);

if (useInactiveColor && state->controlState == DQMLGlobalObject::InactiveState) {
const auto &palette = DGuiApplicationHelper::standardPalette(state->controlTheme);
const auto &windowColor = palette.color(QPalette::Window);

QColor inactiveMaskColor = windowColor;
inactiveMaskColor.setAlphaF(state->controlTheme == DGuiApplicationHelper::DarkType ? 0.6 : 0.4);
colorValue = DGuiApplicationHelper::blendColor(colorValue, inactiveMaskColor);
}

return colorValue;
}

Expand Down
Loading