fix(frontend):搜索结果列表样式适配ukui style plugin
This commit is contained in:
parent
3b316f2164
commit
9d6f19d4af
|
@ -29,6 +29,9 @@ BestListView::BestListView(QWidget *parent) : QTreeView(parent)
|
||||||
{
|
{
|
||||||
this->setProperty("highlightMode", true);
|
this->setProperty("highlightMode", true);
|
||||||
setStyle(ResultItemStyle::getStyle());
|
setStyle(ResultItemStyle::getStyle());
|
||||||
|
connect(ResultItemStyle::getStyle(), &ResultItemStyle::baseStyleChanged, this, [&](){
|
||||||
|
this->style()->polish(this);
|
||||||
|
});
|
||||||
this->setFrameShape(QFrame::NoFrame);
|
this->setFrameShape(QFrame::NoFrame);
|
||||||
this->viewport()->setAttribute(Qt::WA_AcceptTouchEvents);
|
this->viewport()->setAttribute(Qt::WA_AcceptTouchEvents);
|
||||||
this->viewport()->setAutoFillBackground(false);
|
this->viewport()->setAutoFillBackground(false);
|
||||||
|
|
|
@ -20,6 +20,8 @@
|
||||||
#include "result-view-delegate.h"
|
#include "result-view-delegate.h"
|
||||||
#include <QPainterPath>
|
#include <QPainterPath>
|
||||||
#include <QApplication>
|
#include <QApplication>
|
||||||
|
#include <QPen>
|
||||||
|
#include <QStyleFactory>
|
||||||
using namespace UkuiSearch;
|
using namespace UkuiSearch;
|
||||||
static ResultItemStyle *global_instance_of_item_style = nullptr;
|
static ResultItemStyle *global_instance_of_item_style = nullptr;
|
||||||
|
|
||||||
|
@ -46,7 +48,7 @@ void ResultViewDelegate::paint(QPainter *painter, const QStyleOptionViewItem &op
|
||||||
opt.text = QString();
|
opt.text = QString();
|
||||||
|
|
||||||
QStyle *style = opt.widget->style();
|
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);
|
QRect textRect = style->subElementRect(QStyle::SE_ItemViewItemText, &opt, opt.widget);
|
||||||
QFontMetrics fontMetrics(opt.font);
|
QFontMetrics fontMetrics(opt.font);
|
||||||
|
@ -54,8 +56,14 @@ void ResultViewDelegate::paint(QPainter *painter, const QStyleOptionViewItem &op
|
||||||
opt.text = text;
|
opt.text = text;
|
||||||
|
|
||||||
painter->save();
|
painter->save();
|
||||||
|
|
||||||
if(opt.state & QStyle::State_Selected) {
|
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<QPen>()) {
|
||||||
|
m_hightLightEffectHelper->setTextColor(selectPen.value<QPen>().brush());
|
||||||
|
} else {
|
||||||
|
m_hightLightEffectHelper->setTextColor(QBrush(opt.palette.highlightedText().color()));
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
m_hightLightEffectHelper->setTextColor(QBrush(opt.palette.text().color()));
|
m_hightLightEffectHelper->setTextColor(QBrush(opt.palette.text().color()));
|
||||||
}
|
}
|
||||||
|
@ -77,6 +85,17 @@ ResultItemStyle *ResultItemStyle::getStyle()
|
||||||
return global_instance_of_item_style;
|
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
|
int ResultItemStyle::styleHint(QStyle::StyleHint hint, const QStyleOption *option, const QWidget *widget, QStyleHintReturn *returnData) const
|
||||||
{
|
{
|
||||||
switch (hint) {
|
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<const QStyleOptionViewItem *>(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<const QStyleOptionViewItem *>(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)
|
HightLightEffectHelper::HightLightEffectHelper(QObject *parent) : QSyntaxHighlighter(parent)
|
||||||
{
|
{
|
||||||
m_expression.setCaseSensitivity(Qt::CaseInsensitive);
|
m_expression.setCaseSensitivity(Qt::CaseInsensitive);
|
||||||
|
|
|
@ -65,13 +65,16 @@ private:
|
||||||
|
|
||||||
class ResultItemStyle : public QProxyStyle
|
class ResultItemStyle : public QProxyStyle
|
||||||
{
|
{
|
||||||
|
Q_OBJECT
|
||||||
public:
|
public:
|
||||||
static ResultItemStyle *getStyle();
|
static ResultItemStyle *getStyle();
|
||||||
int styleHint(StyleHint hint, const QStyleOption *option, const QWidget *widget, QStyleHintReturn *returnData) const;
|
int styleHint(StyleHint hint, const QStyleOption *option, const QWidget *widget, QStyleHintReturn *returnData) const override;
|
||||||
// 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;
|
Q_SIGNALS:
|
||||||
|
void baseStyleChanged();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
explicit ResultItemStyle() {}
|
explicit ResultItemStyle();
|
||||||
~ResultItemStyle() = default;
|
~ResultItemStyle() = default;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -187,6 +187,9 @@ ResultView::ResultView(const QString &plugin_id, QWidget *parent) : QTreeView(pa
|
||||||
{
|
{
|
||||||
this->setProperty("highlightMode", true);
|
this->setProperty("highlightMode", true);
|
||||||
setStyle(ResultItemStyle::getStyle());
|
setStyle(ResultItemStyle::getStyle());
|
||||||
|
connect(ResultItemStyle::getStyle(), &ResultItemStyle::baseStyleChanged, this, [&](){
|
||||||
|
this->style()->polish(this);
|
||||||
|
});
|
||||||
this->setFrameShape(QFrame::NoFrame);
|
this->setFrameShape(QFrame::NoFrame);
|
||||||
this->viewport()->setAttribute(Qt::WA_AcceptTouchEvents);
|
this->viewport()->setAttribute(Qt::WA_AcceptTouchEvents);
|
||||||
this->viewport()->setAutoFillBackground(false);
|
this->viewport()->setAutoFillBackground(false);
|
||||||
|
|
Loading…
Reference in New Issue