diff --git a/styleplugins/chameleon/chameleonstyle.cpp b/styleplugins/chameleon/chameleonstyle.cpp index 7c72abb..bb7439c 100644 --- a/styleplugins/chameleon/chameleonstyle.cpp +++ b/styleplugins/chameleon/chameleonstyle.cpp @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -122,6 +123,57 @@ inline static bool isTheClassObject(QObject *object) #endif } +ChameleonMovementAnimation::ChameleonMovementAnimation(QWidget *targetWidget) + : QVariantAnimation(targetWidget) +{ + setDuration(150); + + connect(this, &QVariantAnimation::valueChanged, targetWidget, [this] (const QVariant &value) { + if (!isRuning()) + return; + + const auto rect = value.toRect(); + Q_ASSERT(!m_currentRect.isEmpty()); + this->targetWidget()->update(m_currentRect.united(rect)); + m_currentRect = rect; + }); + connect(this, &QVariantAnimation::finished, targetWidget, [this] { + Q_ASSERT(m_currentRect == m_targetRect); + // 确保动画结束后有一帧的刷新，因为在菜单的动画过程中会修改菜单文字的 opacity + // 对opacity的修改会根据是否处于动画状态进行判断，因此要确保动画结束后刷新它 + this->targetWidget()->update(m_currentRect); + }); +} + +QWidget *ChameleonMovementAnimation::targetWidget() const +{ + return qobject_cast(parent()); +} + +void ChameleonMovementAnimation::setTargetRect(const QRect &rect) +{ + if (m_targetRect == rect) + return; + + m_lastTargetRect = m_targetRect; + m_targetRect = rect; + + if (m_currentRect.isEmpty()) + m_currentRect = m_lastTargetRect; + + // 当目标绘制区域改变时，说明当前正在进行的动画过期了，应该重新开始动画 + stop(); + setStartValue(m_currentRect); + setEndValue(rect); + + if (!m_currentRect.isEmpty()) { + start(); + } else { + // 这种情况说明不需要进行动画，往往发生在首次显示，这时候应该直接绘制到目标区域 + m_currentRect = rect; + } +} + ChameleonStyle::ChameleonStyle() : DStyle() { @@ -1370,7 +1422,17 @@ void ChameleonStyle::drawControl(QStyle::ControlElement element, const QStyleOpt frameRadius = qMin(height / 2, 4); } p->setBrush(getColor(opt, DPalette::ObviousBackground, w)); + p->setPen(Qt::NoPen); p->drawRoundedRect(opt->rect, frameRadius, frameRadius); + + QPen pen; + pen.setColor(DGuiApplicationHelper::instance()->themeType() == DGuiApplicationHelper::DarkType + ? QColor(255, 255, 255, 0.15 * 255) + : QColor(0, 0, 0, 0.15 * 255)); + pen.setWidth(2); + p->setPen(pen); + p->setBrush(Qt::NoBrush); + p->drawRoundedRect(opt->rect.marginsRemoved(QMargins(1, 1, 1, 1)), frameRadius, frameRadius); } return; } @@ -1410,7 +1472,7 @@ void ChameleonStyle::drawControl(QStyle::ControlElement element, const QStyleOpt linear.setColorAt(0, startColor); linear.setColorAt(1, endColor); linear.setSpread(QGradient::PadSpread); - p->setBrush(QBrush(linear)); + p->setBrush(startColor); if (progBar->textVisible) { QPainterPath pathRect; @@ -1418,7 +1480,25 @@ void ChameleonStyle::drawControl(QStyle::ControlElement element, const QStyleOpt QPainterPath pathRoundRect; pathRoundRect.addRoundedRect(opt->rect, frameRadius, frameRadius); QPainterPath inter = pathRoundRect.intersected(pathRect); + + QPainterPath clipPath; + clipPath.addRoundedRect(rect, frameRadius, frameRadius); + p->setClipPath(clipPath); + p->setClipping(true); p->drawPath(inter); + p->setClipping(false); + + QPen pen; + pen.setColor(DGuiApplicationHelper::instance()->themeType() == DGuiApplicationHelper::DarkType + ? QColor(255, 255, 255, 0.3 * 255) + : QColor(0, 0, 0, 0.3 * 255)); + pen.setWidth(2); + p->setPen(pen); + p->setBrush(Qt::NoBrush); + p->setClipping(true); + p->drawRoundedRect(rect.marginsRemoved(QMargins(1, 1, 1, 1)), frameRadius, frameRadius); + p->setClipping(false); + } else { //进度条高度 <= 8px && 进度条宽度 <= 8px && value有效 if (rect.height() <= ProgressBar_MinimumStyleHeight && @@ -1444,8 +1524,23 @@ void ChameleonStyle::drawControl(QStyle::ControlElement element, const QStyleOpt path2.arcTo(endRect, 90, -180); p->drawPath(path2); } - } else + } else { + QPainterPath clipPath; + clipPath.addRoundedRect(opt->rect, frameRadius, frameRadius); + p->setClipPath(clipPath); + p->setClipping(true); p->drawRoundedRect(rect, frameRadius, frameRadius); + p->setClipping(false); + + QPen pen; + pen.setColor(QColor(0, 0, 0, 0.3 * 255)); + pen.setWidth(2); + p->setPen(pen); + p->setBrush(Qt::NoBrush); + p->setClipping(true); + p->drawRoundedRect(rect.marginsRemoved(QMargins(1, 1, 1, 1)), frameRadius, frameRadius); + p->setClipping(false); + } } } return; @@ -2757,7 +2852,7 @@ bool ChameleonStyle::drawMenuBarItem(const QStyleOptionMenuItem *option, QRect & return true; } -void ChameleonStyle::drawMenuItemBackground(const QStyleOption *option, QPainter *painter, QStyleOptionMenuItem::MenuItemType type) const +ChameleonMovementAnimation *ChameleonStyle::drawMenuItemBackground(const QStyleOption *option, QPainter *painter, QStyleOptionMenuItem::MenuItemType type) const { QBrush color; bool selected = (option->state & QStyle::State_Enabled) && option->state & QStyle::State_Selected; @@ -2766,7 +2861,7 @@ void ChameleonStyle::drawMenuItemBackground(const QStyleOption *option, QPainter painter->setPen(Qt::NoPen); painter->setBrush(getColor(option, QPalette::Highlight)); painter->drawRect(option->rect); - return; + return nullptr; } // 清理旧的阴影 @@ -2791,8 +2886,6 @@ void ChameleonStyle::drawMenuItemBackground(const QStyleOption *option, QPainter } if (selected) { - color = option->palette.highlight(); - // draw shadow if (type == QStyleOptionMenuItem::Normal) { if (option->styleObject) { @@ -2807,9 +2900,7 @@ void ChameleonStyle::drawMenuItemBackground(const QStyleOption *option, QPainter } } } - - painter->fillRect(option->rect, color); - } else { + } else do { color = option->palette.window().color(); if (color.color().isValid() && color.color().alpha() != 0) { @@ -2846,14 +2937,14 @@ void ChameleonStyle::drawMenuItemBackground(const QStyleOption *option, QPainter } if (!option->styleObject) - return; + break; // 为上一个item绘制阴影 const QRect shadow = option->styleObject->property("_d_menu_shadow_rect").toRect(); // 判断阴影rect是否在自己的区域 if (!option->rect.contains(shadow.center())) - return; + break; static QColor shadow_color; static QPixmap shadow_pixmap; @@ -2870,11 +2961,47 @@ void ChameleonStyle::drawMenuItemBackground(const QStyleOption *option, QPainter if (!shadow_pixmap.isNull()) { if (QMenu *menu = qobject_cast(option->styleObject)) { if (!menu->geometry().contains(QCursor::pos())) - return; + break; } painter->drawPixmap(shadow, shadow_pixmap); } + } while (false); + + { // 无论如何都尝试绘制，因为可能有动画存在 + color = option->palette.highlight(); + + QWidget *animationTargetWidget = qobject_cast(option->styleObject); + if (!option->styleObject) + animationTargetWidget = dynamic_cast(painter->device()); + + ChameleonMovementAnimation *animation = nullptr; + + if (animationTargetWidget) { + animation = animationTargetWidget->findChild("_d_menu_select_animation", + Qt::FindDirectChildrenOnly); + if (!animation) { + animation = new ChameleonMovementAnimation(animationTargetWidget); + animation->setObjectName("_d_menu_select_animation"); + } + + if (selected) + animation->setTargetRect(option->rect); + } + + if (animation && animation->isRuning()) { + auto opacity = painter->opacity(); + // 一些状态为 disable 的 menu item 在绘制时会修改不透明度，这里暂时改回1.0。 + painter->setOpacity(1.0); + painter->fillRect(animation->currentRect(), color); + painter->setOpacity(opacity); + + return animation; + } else if (selected) { + painter->fillRect(option->rect, color); + } } + + return nullptr; } void ChameleonStyle::drawMenuItemRedPoint(const QStyleOptionMenuItem *option, QPainter *painter, const QWidget *widget) const @@ -2955,7 +3082,7 @@ bool ChameleonStyle::drawMenuItem(const QStyleOptionMenuItem *option, QPainter * bool sunken = menuItem->state & State_Sunken; //绘制背景 - drawMenuItemBackground(option, painter, menuItem->menuItemType); + auto animation = drawMenuItemBackground(option, painter, menuItem->menuItemType); //绘制分段 if (menuItem->menuItemType == QStyleOptionMenuItem::Separator) { @@ -2972,6 +3099,13 @@ bool ChameleonStyle::drawMenuItem(const QStyleOptionMenuItem *option, QPainter * return true; } + const bool useHighlightedText = selected && !animation; + if (!useHighlightedText && selected) { + // 在动画中时，selected item 的文字颜色不会使用 HighlightedText，当动画结束后会立即 + // 变为 HighlightedText，会显得比较突然，因此使用不透明度对文本等内容进行过渡 + painter->setOpacity(1.0 - animation->progress()); + } + //绘制选择框 bool ignoreCheckMark = false; @@ -2990,7 +3124,7 @@ bool ChameleonStyle::drawMenuItem(const QStyleOptionMenuItem *option, QPainter * checkRect.moveCenter(QPoint(checkRect.left() + smallIconSize / 2, menuItem->rect.center().y())); painter->setRenderHint(QPainter::Antialiasing); - if (selected) + if (useHighlightedText) painter->setPen(getColor(option, QPalette::HighlightedText)); else painter->setPen(getColor(option, QPalette::BrightText)); @@ -3010,7 +3144,7 @@ bool ChameleonStyle::drawMenuItem(const QStyleOptionMenuItem *option, QPainter * } - if (selected) { + if (useHighlightedText) { painter->setPen(getColor(option, QPalette::HighlightedText)); } else { if ((option->state & QStyle::State_Enabled)) { diff --git a/styleplugins/chameleon/chameleonstyle.h b/styleplugins/chameleon/chameleonstyle.h index bb7276d..67d576f 100644 --- a/styleplugins/chameleon/chameleonstyle.h +++ b/styleplugins/chameleon/chameleonstyle.h @@ -6,6 +6,7 @@ #define CHAMELEONSTYLE_H #include +#include DWIDGET_USE_NAMESPACE @@ -18,6 +19,33 @@ class DStyleOptionButtonBoxButton; DWIDGET_END_NAMESPACE namespace chameleon { +class ChameleonMovementAnimation : public QVariantAnimation +{ + Q_OBJECT + +public: + explicit ChameleonMovementAnimation(QWidget *targetWidget); + + inline QRect currentRect() const { + return m_currentRect; + } + + inline bool isRuning() const { + return state() == QVariantAnimation::Running; + } + + inline float progress() const { + return float(currentLoopTime()) / duration(); + } + + QWidget *targetWidget() const; + void setTargetRect(const QRect &rect); + +private: + QRect m_currentRect; + QRect m_targetRect; + QRect m_lastTargetRect; +}; class ChameleonStyle : public DStyle { @@ -67,7 +95,7 @@ class ChameleonStyle : public DStyle bool drawSpinBox(const QStyleOptionSpinBox *opt, QPainter *p, const QWidget *w) const; void updateSpinBoxButtonState(const QStyleOptionSpinBox *opt, QStyleOptionButton& button, bool isActive, bool isEnabled) const; bool drawMenuBarItem(const QStyleOptionMenuItem *option, QRect &rect, QPainter *painter, const QWidget *widget) const; - void drawMenuItemBackground(const QStyleOption *option, QPainter *painter, QStyleOptionMenuItem::MenuItemType type) const; + ChameleonMovementAnimation *drawMenuItemBackground(const QStyleOption *option, QPainter *painter, QStyleOptionMenuItem::MenuItemType type) const; bool drawMenuItem(const QStyleOptionMenuItem *option, QPainter *painter, const QWidget *widget) const; bool drawTabBar(QPainter *painter ,const QStyleOptionTab *tab, const QWidget *widget) const; bool drawTabBarLabel(QPainter *painter ,const QStyleOptionTab *tab, const QWidget *widget) const;