kiwix/kiwix-desktop
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-desktop.git synced 2025-09-22 11:37:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Full length library entry line separator

Browse Source 
Now the library entry line separator extends all the way to the right
(into the book open/download control column).

This is achieved by having QStyledItemDelegate::paint() execute before
ContentManagerDelegate::paintBookState() and the latter must take care
to not paint over the line separator painted by the former.
This commit is contained in:
Veloman Yunkan 2024-05-17 13:09:10 +04:00
parent 4e166398b5
commit b0ce8c583f
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/contentmanagerdelegate.cpp
View File

@ -164,8 +164,14 @@ void ContentManagerDelegate::paintButton(QPainter *p, const QRect &r, QString t)
baseButton->style()->drawControl( QStyle::CE_PushButton, &button, p, baseButton.data()); baseButton->style()->drawControl( QStyle::CE_PushButton, &button, p, baseButton.data());
} }
void ContentManagerDelegate::paintBookState(QPainter *p, QRect r, const QModelIndex &index) const void ContentManagerDelegate::paintBookState(QPainter *p, const QStyleOptionViewItem &opt, const QModelIndex &index) const
{ {
const QRect r = opt.rect;
if (opt.state & QStyle::State_MouseOver) {
// don't paint over the line separator
const auto cellInternalArea = r.adjusted(0, 0, 0, -1);
p->fillRect(cellInternalArea, QBrush("#eaecf0"));
}
const auto node = static_cast<RowNode*>(index.internalPointer()); const auto node = static_cast<RowNode*>(index.internalPointer());
const auto id = node->getBookId(); const auto id = node->getBookId();
switch ( KiwixApp::instance()->getContentManager()->getBookState(id) ) { switch ( KiwixApp::instance()->getContentManager()->getBookState(id) ) {
@ -197,13 +203,6 @@ void ContentManagerDelegate::paint(QPainter *painter, const QStyleOptionViewItem
return; return;
} }
QStyleOptionViewItem eOpt = option; QStyleOptionViewItem eOpt = option;
if (index.column() == 5) {
if (option.state & QStyle::State_MouseOver) {
painter->fillRect(option.rect, QBrush("#eaecf0"));
}
paintBookState(painter, option.rect, index);
return;
}
if (index.column() == 1) { if (index.column() == 1) {
auto bFont = painter->font(); auto bFont = painter->font();
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
@ -213,7 +212,12 @@ void ContentManagerDelegate::paint(QPainter *painter, const QStyleOptionViewItem
#endif #endif
eOpt.font = bFont; eOpt.font = bFont;
} }
QStyledItemDelegate::paint(painter, eOpt, index); QStyledItemDelegate::paint(painter, eOpt, index);
if (index.column() == 5) {
paintBookState(painter, eOpt, index);
}
} }
bool ContentManagerDelegate::editorEvent(QEvent *event, QAbstractItemModel *model, const QStyleOptionViewItem &option, const QModelIndex &index) bool ContentManagerDelegate::editorEvent(QEvent *event, QAbstractItemModel *model, const QStyleOptionViewItem &option, const QModelIndex &index)

2
src/contentmanagerdelegate.h
View File

@ -16,7 +16,7 @@ public:
QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override; QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override;
private: // functions private: // functions
void paintBookState(QPainter *p, QRect r, const QModelIndex &index) const; void paintBookState(QPainter *p, const QStyleOptionViewItem &opt, const QModelIndex &index) const;
void paintButton(QPainter *p, const QRect &r, QString t) const; void paintButton(QPainter *p, const QRect &r, QString t) const;
private: private: