openkylin
/
ukui-search
mirror of https://gitee.com/openkylin/ukui-search.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

!24 解决平板模式下，单击结果项直接执行打开动作，无法打开详情页的问题。 

Merge pull request !24 from iaom/1102
This commit is contained in:
纪笑旭 2022-11-08 00:53:09 +00:00 committed by Gitee
parent c37bcfd278 34fa8c7498
commit b95c481a9e
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
5 changed files with 156 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/view/best-list-view.cpp
View File

@ -8,7 +8,7 @@
using namespace UkuiSearch;
BestListView::BestListView(QWidget *parent) : QTreeView(parent)
{
// setStyle(ResultItemStyle::getStyle());
setStyle(ResultItemStyle::getStyle());
this->setFrameShape(QFrame::NoFrame);
this->viewport()->setAutoFillBackground(false);
this->setIconSize(QSize(VIEW_ICON_SIZE, VIEW_ICON_SIZE));

277
frontend/view/result-view-delegate.cpp
View File

@ -45,7 +45,6 @@ void ResultViewDelegate::paint(QPainter *painter, const QStyleOptionViewItem &op
m_hightLightEffectHelper->setTextColor(QBrush(opt.palette.text().color()));
}
m_textDoc->setPlainText(text);
m_hightLightEffectHelper->setDocument(m_textDoc);
m_hightLightEffectHelper->rehighlight();
@ -63,150 +62,160 @@ ResultItemStyle *ResultItemStyle::getStyle()
return global_instance_of_item_style;
}
void ResultItemStyle::drawPrimitive(QStyle::PrimitiveElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget) const
int ResultItemStyle::styleHint(QStyle::StyleHint hint, const QStyleOption *option, const QWidget *widget, QStyleHintReturn *returnData) 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;
}
switch (hint) {
case SH_ItemView_ActivateItemOnSingleClick:
return false;
default:
break;
// return QProxyStyle::drawPrimitive(element, option, painter, widget);
return qApp->style()->styleHint(hint, option, widget, returnData);
}
}
}
//void ResultItemStyle::drawPrimitive(QStyle::PrimitiveElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget) const
//{
// switch (element) {
// case PE_PanelItemViewItem: {
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);
}
// bool isIconView = false;
// auto opt = qstyleoption_cast<const QStyleOptionViewItem *>(option);
// if (!opt)
// return;
// if (opt) {
// isIconView = (opt->decorationPosition & QStyleOptionViewItem::Top);
// }
QRect checkRect = proxy()->subElementRect(SE_ItemViewItemCheckIndicator, vopt, widget);
QRect iconRect = proxy()->subElementRect(SE_ItemViewItemDecoration, vopt, widget);
// 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);
// draw the background
proxy()->drawPrimitive(PE_PanelItemViewItem, option, painter, widget);
// 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;
// draw the check mark
if (vopt->features & QStyleOptionViewItem::HasCheckIndicator) {
QStyleOptionViewItem option(*vopt);
option.rect = checkRect;
option.state = option.state & ~QStyle::State_HasFocus;
// 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));
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);
}
// 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));
// 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);
// 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));
iconRect.moveLeft(8);
QStyle::drawItemPixmap(painter, iconRect, vopt->decorationAlignment, pixmap);
painter->restore();
return;
}
break;
}
default:
break;
}
}
// 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)
{

5
frontend/view/result-view-delegate.h
View File

@ -69,8 +69,9 @@ class ResultItemStyle : public QProxyStyle
{
public:
static ResultItemStyle *getStyle();
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;
// 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;
private:
explicit ResultItemStyle() {}
~ResultItemStyle() = default;

2
frontend/view/result-view.cpp
View File

@ -166,7 +166,7 @@ void ResultWidget::initConnections()
ResultView::ResultView(const QString &plugin_id, QWidget *parent) : QTreeView(parent)
{
// setStyle(ResultItemStyle::getStyle());
setStyle(ResultItemStyle::getStyle());
this->setFrameShape(QFrame::NoFrame);
this->viewport()->setAttribute(Qt::WA_AcceptTouchEvents);
this->viewport()->setAutoFillBackground(false);

1
frontend/view/web-search-view.cpp
View File

@ -28,6 +28,7 @@
using namespace UkuiSearch;
WebSearchView::WebSearchView(QWidget *parent) : QTreeView(parent)
{
setStyle(ResultItemStyle::getStyle());
this->setFrameShape(QFrame::NoFrame);
this->viewport()->setAutoFillBackground(false);
this->setRootIsDecorated(false);