From 9d6f19d4af8f77101ce0239dc77badb55c3cbc83 Mon Sep 17 00:00:00 2001 From: iaom Date: Thu, 14 Dec 2023 14:00:03 +0800 Subject: [PATCH] =?UTF-8?q?fix(frontend):=E6=90=9C=E7=B4=A2=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E5=88=97=E8=A1=A8=E6=A0=B7=E5=BC=8F=E9=80=82=E9=85=8D?= =?UTF-8?q?ukui=20style=20plugin?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/view/best-list-view.cpp | 3 + frontend/view/result-view-delegate.cpp | 168 ++++--------------------- frontend/view/result-view-delegate.h | 11 +- frontend/view/result-view.cpp | 3 + 4 files changed, 34 insertions(+), 151 deletions(-) diff --git a/frontend/view/best-list-view.cpp b/frontend/view/best-list-view.cpp index cccb745..9991c56 100644 --- a/frontend/view/best-list-view.cpp +++ b/frontend/view/best-list-view.cpp @@ -29,6 +29,9 @@ BestListView::BestListView(QWidget *parent) : QTreeView(parent) { this->setProperty("highlightMode", true); setStyle(ResultItemStyle::getStyle()); + connect(ResultItemStyle::getStyle(), &ResultItemStyle::baseStyleChanged, this, [&](){ + this->style()->polish(this); + }); this->setFrameShape(QFrame::NoFrame); this->viewport()->setAttribute(Qt::WA_AcceptTouchEvents); this->viewport()->setAutoFillBackground(false); diff --git a/frontend/view/result-view-delegate.cpp b/frontend/view/result-view-delegate.cpp index c5f2f98..fc55b02 100644 --- a/frontend/view/result-view-delegate.cpp +++ b/frontend/view/result-view-delegate.cpp @@ -20,6 +20,8 @@ #include "result-view-delegate.h" #include #include +#include +#include using namespace UkuiSearch; static ResultItemStyle *global_instance_of_item_style = nullptr; @@ -46,7 +48,7 @@ void ResultViewDelegate::paint(QPainter *painter, const QStyleOptionViewItem &op opt.text = QString(); QStyle *style = opt.widget->style(); - style->proxy()->drawControl(QStyle::CE_ItemViewItem, &opt, painter, opt.widget); //绘制非文本区域内容 + style->drawControl(QStyle::CE_ItemViewItem, &opt, painter, opt.widget); //绘制非文本区域内容 QRect textRect = style->subElementRect(QStyle::SE_ItemViewItemText, &opt, opt.widget); QFontMetrics fontMetrics(opt.font); @@ -54,8 +56,14 @@ void ResultViewDelegate::paint(QPainter *painter, const QStyleOptionViewItem &op opt.text = text; painter->save(); + if(opt.state & QStyle::State_Selected) { - m_hightLightEffectHelper->setTextColor(QBrush(opt.palette.highlightedText().color())); + QVariant selectPen = opt.widget->property("textSelectPen"); + if(selectPen.isValid() && selectPen.canConvert()) { + m_hightLightEffectHelper->setTextColor(selectPen.value().brush()); + } else { + m_hightLightEffectHelper->setTextColor(QBrush(opt.palette.highlightedText().color())); + } } else { m_hightLightEffectHelper->setTextColor(QBrush(opt.palette.text().color())); } @@ -77,6 +85,17 @@ ResultItemStyle *ResultItemStyle::getStyle() return global_instance_of_item_style; } +ResultItemStyle::ResultItemStyle() +{ + connect(qApp, &QApplication::paletteChanged, this, [&](){ + auto style = QStyleFactory::create("ukui"); + if(style) { + setBaseStyle(style); + Q_EMIT baseStyleChanged(); + } + }); +} + int ResultItemStyle::styleHint(QStyle::StyleHint hint, const QStyleOption *option, const QWidget *widget, QStyleHintReturn *returnData) const { switch (hint) { @@ -87,151 +106,6 @@ int ResultItemStyle::styleHint(QStyle::StyleHint hint, const QStyleOption *optio } } -//void ResultItemStyle::drawPrimitive(QStyle::PrimitiveElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget) const -//{ -// switch (element) { -// case PE_PanelItemViewItem: { - -// bool isIconView = false; -// auto opt = qstyleoption_cast(option); -// if (!opt) -// return; -// if (opt) { -// isIconView = (opt->decorationPosition & QStyleOptionViewItem::Top); -// } - -// bool isHover = (option->state & State_MouseOver) && (option->state & ~State_Selected); -// bool isSelected = option->state & State_Selected; -// bool enable = option->state & State_Enabled; -// QColor color = option->palette.color(enable? QPalette::Active: QPalette::Disabled, QPalette::Highlight); - -// if (isSelected) { -// color.setAlpha(255); -// } else if (isHover) { -// // color = opt->palette.color(QPalette::Active, QPalette::BrightText); -// // color.setAlpha(0.05); -// color = QColor(241, 241, 241); -// } else { -// color.setAlpha(0); -// } -// QPainterPath path; - -// if(opt->viewItemPosition == QStyleOptionViewItem::OnlyOne) { -// path.addRoundedRect(option->rect, 6, 6); -// } else if(opt->viewItemPosition == QStyleOptionViewItem::Beginning) { -// //一个左侧有两个圆角的矩形 -// path.moveTo(option->rect.topLeft() + QPoint(6, 0)); -// path.cubicTo(option->rect.topLeft() + QPoint(6, 0), -// option->rect.topLeft(), option->rect.topLeft() + -// QPoint(0, 6)); - -// path.lineTo(option->rect.bottomLeft() - QPoint(0, 6)); -// path.cubicTo(option->rect.bottomLeft() - QPoint(0, 6), -// option->rect.bottomLeft() + QPoint(0, 1), -// option->rect.bottomLeft() + QPoint(6, 1)); - -// path.lineTo(option->rect.bottomRight() + QPoint(1, 1)); -// path.lineTo(option->rect.topRight()+ QPoint(1, 0)); -// path.lineTo(option->rect.topLeft() + QPoint(6, 0)); -// } else if(opt->viewItemPosition == QStyleOptionViewItem::Middle) { -// path.addRect(option->rect.adjusted(-1, 0, 1, 0)); -// } else if(opt->viewItemPosition == QStyleOptionViewItem::End) { -// //一个右侧有两个圆角的矩形 -// path.moveTo(option->rect.topRight() + QPoint(-6, 0)); -// path.cubicTo(option->rect.topRight() + QPoint(-6, 0), -// option->rect.topRight(), -// option->rect.topRight() + -// QPoint(0, 6)); - -// path.lineTo(option->rect.bottomRight() - QPoint(0, 6)); -// path.cubicTo(option->rect.bottomRight() - QPoint(0, 6), -// option->rect.bottomRight() + QPoint(0, 1), -// option->rect.bottomRight() + QPoint(-6, 1)); - -// path.lineTo(option->rect.bottomLeft() + QPoint(0, 1)); -// path.lineTo(option->rect.topLeft()); -// path.lineTo(option->rect.topRight() + QPoint(-6, 0)); -// } else { -// // path.addRoundedRect(option->rect, 8, 8); -// } - -// painter->save(); -// painter->setRenderHint(QPainter::Antialiasing); -// painter->setPen(Qt::NoPen); -// painter->setBrush(color); -// painter->drawPath(path); -// // painter->fillPath(path, painter->brush()); - -// painter->restore(); -// break; -// } -// default: -// break; -//// return QProxyStyle::drawPrimitive(element, option, painter, widget); -// } - -//} - -//void ResultItemStyle::drawControl(QStyle::ControlElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget) const -//{ -// switch (element) { -// case CE_ItemViewItem: { -// if (const QStyleOptionViewItem *vopt = qstyleoption_cast(option)) { -// painter->save(); -// if (painter->clipPath().isEmpty()) { -// painter->setClipRect(option->rect); -// } - -// QRect checkRect = proxy()->subElementRect(SE_ItemViewItemCheckIndicator, vopt, widget); -// QRect iconRect = proxy()->subElementRect(SE_ItemViewItemDecoration, vopt, widget); - -// // draw the background -// proxy()->drawPrimitive(PE_PanelItemViewItem, option, painter, widget); - -// // draw the check mark -// if (vopt->features & QStyleOptionViewItem::HasCheckIndicator) { -// QStyleOptionViewItem option(*vopt); -// option.rect = checkRect; -// option.state = option.state & ~QStyle::State_HasFocus; - -// switch (vopt->checkState) { -// case Qt::Unchecked: -// option.state |= QStyle::State_Off; -// break; -// case Qt::PartiallyChecked: -// option.state |= QStyle::State_NoChange; -// break; -// case Qt::Checked: -// option.state |= QStyle::State_On; -// break; -// default: -// break; -// } -// proxy()->drawPrimitive(QStyle::PE_IndicatorViewItemCheck, &option, painter, widget); -// } - -// // draw the icon -// QIcon::Mode mode = QIcon::Normal; -// if (!(vopt->state & QStyle::State_Enabled)) { -// mode = QIcon::Disabled; -// } else if (vopt->state & QStyle::State_Selected) { -// mode = QIcon::Selected; -// } -// QIcon::State state = vopt->state & QStyle::State_Open ? QIcon::On : QIcon::Off; -// auto pixmap = vopt->icon.pixmap(vopt->decorationSize, mode, state); - -// iconRect.moveLeft(8); -// QStyle::drawItemPixmap(painter, iconRect, vopt->decorationAlignment, pixmap); -// painter->restore(); -// return; -// } -// break; -// } -// default: -// break; -// } -//} - HightLightEffectHelper::HightLightEffectHelper(QObject *parent) : QSyntaxHighlighter(parent) { m_expression.setCaseSensitivity(Qt::CaseInsensitive); diff --git a/frontend/view/result-view-delegate.h b/frontend/view/result-view-delegate.h index 8c09951..d11d324 100644 --- a/frontend/view/result-view-delegate.h +++ b/frontend/view/result-view-delegate.h @@ -65,13 +65,16 @@ private: class ResultItemStyle : public QProxyStyle { + Q_OBJECT public: static ResultItemStyle *getStyle(); - int styleHint(StyleHint hint, const QStyleOption *option, const QWidget *widget, QStyleHintReturn *returnData) const; -// void drawPrimitive(QStyle::PrimitiveElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget = nullptr) const; -// void drawControl(ControlElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget = nullptr) const override; + int styleHint(StyleHint hint, const QStyleOption *option, const QWidget *widget, QStyleHintReturn *returnData) const override; + +Q_SIGNALS: + void baseStyleChanged(); + private: - explicit ResultItemStyle() {} + explicit ResultItemStyle(); ~ResultItemStyle() = default; }; } diff --git a/frontend/view/result-view.cpp b/frontend/view/result-view.cpp index 8d4483c..d548f5b 100644 --- a/frontend/view/result-view.cpp +++ b/frontend/view/result-view.cpp @@ -187,6 +187,9 @@ ResultView::ResultView(const QString &plugin_id, QWidget *parent) : QTreeView(pa { this->setProperty("highlightMode", true); setStyle(ResultItemStyle::getStyle()); + connect(ResultItemStyle::getStyle(), &ResultItemStyle::baseStyleChanged, this, [&](){ + this->style()->polish(this); + }); this->setFrameShape(QFrame::NoFrame); this->viewport()->setAttribute(Qt::WA_AcceptTouchEvents); this->viewport()->setAutoFillBackground(false);