Skip to content

fix: missing antialiased for menuItem #253

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
Dec 30, 2024
Merged

fix: missing antialiased for menuItem #253

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: 9 additions & 5 deletions styleplugins/chameleon/chameleonstyle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3076,12 +3076,14 @@ bool ChameleonStyle::drawMenuBarItem(const QStyleOptionMenuItem *option, QRect &
ChameleonMovementAnimation *ChameleonStyle::drawMenuItemBackground(const QStyleOption *option, QPainter *painter, QStyleOptionMenuItem::MenuItemType type) const
{
QBrush color;
constexpr int margin = 6; // margin of MenuItem's bounding.
const auto rect = option->rect.marginsRemoved(QMargins(margin, 0, margin, 0));
bool selected = (option->state & QStyle::State_Enabled) && option->state & QStyle::State_Selected;
if (selected && (DGuiApplicationHelper::isTabletEnvironment() ||
!DGuiApplicationHelper::isSpecialEffectsEnvironment())) {
painter->setPen(Qt::NoPen);
painter->setBrush(getColor(option, QPalette::Highlight));
painter->drawRect(option->rect);
painter->drawRect(rect);
return nullptr;
}

Expand Down Expand Up @@ -3117,7 +3119,7 @@ ChameleonMovementAnimation *ChameleonStyle::drawMenuItemBackground(const QStyleO
colorSeparator = QColor(255, 255, 255, 255 * 0.05);
else
colorSeparator = QColor(0, 0, 0, 255 * 0.1);
painter->fillRect(option->rect, colorSeparator);
painter->fillRect(rect, colorSeparator);
}

if (!option->styleObject)
Expand All @@ -3143,7 +3145,7 @@ ChameleonMovementAnimation *ChameleonStyle::drawMenuItemBackground(const QStyleO
}

if (selected)
animation->setTargetRect(option->rect);
animation->setTargetRect(rect);
}
const int round = 6;
if (animation && animation->isRuning()) {
Expand All @@ -3153,6 +3155,7 @@ ChameleonMovementAnimation *ChameleonStyle::drawMenuItemBackground(const QStyleO
painter->setOpacity(1.0);
painter->setBrush(color);
painter->setPen(Qt::NoPen);
painter->setRenderHint(QPainter::Antialiasing);
painter->drawRoundedRect(animation->currentRect(), round, round);
painter->setOpacity(opacity);
painter->restore();
Expand All @@ -3162,7 +3165,8 @@ ChameleonMovementAnimation *ChameleonStyle::drawMenuItemBackground(const QStyleO
painter->save();
painter->setBrush(color);
painter->setPen(Qt::NoPen);
painter->drawRoundedRect(option->rect, round, round);
painter->setRenderHint(QPainter::Antialiasing);
painter->drawRoundedRect(rect, round, round);
painter->restore();
}
}
Expand Down Expand Up @@ -4496,7 +4500,7 @@ int ChameleonStyle::pixelMetric(QStyle::PixelMetric m, const QStyleOption *opt,
case PM_MenuVMargin:
return 8;
case PM_MenuHMargin:
return 6;
return 0;
default:
break;
}
Expand Down
Loading