From 84331eb32e884f3ef7db3a09ae7fed0f6af93226 Mon Sep 17 00:00:00 2001 From: DavidXanatos Date: Wed, 20 Jul 2022 09:35:07 +0200 Subject: [PATCH] 1.2.4 --- SandboxiePlus/SandMan/SandMan.cpp | 9 --------- SandboxiePlus/SandMan/SandMan.h | 10 ++++++++++ SandboxiePlus/SandMan/Views/FileView.cpp | 1 + SandboxiePlus/SandMan/Views/SbieView.cpp | 1 + SandboxiePlus/SandMan/Views/TraceView.cpp | 5 +++-- 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/SandboxiePlus/SandMan/SandMan.cpp b/SandboxiePlus/SandMan/SandMan.cpp index 06f922ce..23713c02 100644 --- a/SandboxiePlus/SandMan/SandMan.cpp +++ b/SandboxiePlus/SandMan/SandMan.cpp @@ -2452,15 +2452,6 @@ void CSandMan::SetUITheme() GetFileView()->GetTree()->setPalette(QApplication::palette()); } - // this makes the selection look a bit nicer but breaks keyboard navigation - /*QPalette p = GetBoxView()->GetTree()->palette(); - p.setColor(QPalette::Highlight, QApplication::palette().color(QPalette::Highlight)); - p.setColor(QPalette::HighlightedText, QApplication::palette().color(QPalette::HighlightedText)); - GetBoxView()->GetTree()->setFocusPolicy(Qt::NoFocus); - GetBoxView()->GetTree()->setPalette(p); - GetFileView()->GetTree()->setFocusPolicy(Qt::NoFocus); - GetFileView()->GetTree()->setPalette(p);*/ - m_DarkTheme = bDark; CTreeItemModel::SetDarkMode(bDark); diff --git a/SandboxiePlus/SandMan/SandMan.h b/SandboxiePlus/SandMan/SandMan.h index 38665dcb..1a316926 100644 --- a/SandboxiePlus/SandMan/SandMan.h +++ b/SandboxiePlus/SandMan/SandMan.h @@ -384,5 +384,15 @@ protected: CPanelWidgetEx* m_pRecoveryLog; }; +#include +class CTreeItemDelegate : public QStyledItemDelegate +{ + void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const + { + QStyleOptionViewItem opt(option); + opt.state &= ~QStyle::State_HasFocus; + QStyledItemDelegate::paint(painter, opt, index); + } +}; extern CSandMan* theGUI; diff --git a/SandboxiePlus/SandMan/Views/FileView.cpp b/SandboxiePlus/SandMan/Views/FileView.cpp index 4a8fe158..a6e38966 100644 --- a/SandboxiePlus/SandMan/Views/FileView.cpp +++ b/SandboxiePlus/SandMan/Views/FileView.cpp @@ -23,6 +23,7 @@ CFileView::CFileView(QWidget *parent) QStyle* pStyle = QStyleFactory::create("windows"); m_pTreeView->setStyle(pStyle); + m_pTreeView->setItemDelegate(new CTreeItemDelegate()); m_pTreeView->setExpandsOnDoubleClick(false); diff --git a/SandboxiePlus/SandMan/Views/SbieView.cpp b/SandboxiePlus/SandMan/Views/SbieView.cpp index ea7aa537..b7f1642f 100644 --- a/SandboxiePlus/SandMan/Views/SbieView.cpp +++ b/SandboxiePlus/SandMan/Views/SbieView.cpp @@ -63,6 +63,7 @@ CSbieView::CSbieView(QWidget* parent) : CPanelView(parent) QStyle* pStyle = QStyleFactory::create("windows"); m_pSbieTree->setStyle(pStyle); + m_pSbieTree->setItemDelegate(new CTreeItemDelegate()); m_pSbieTree->setContextMenuPolicy(Qt::CustomContextMenu); connect(m_pSbieTree, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(OnMenu(const QPoint &))); diff --git a/SandboxiePlus/SandMan/Views/TraceView.cpp b/SandboxiePlus/SandMan/Views/TraceView.cpp index 543033fb..f360dc23 100644 --- a/SandboxiePlus/SandMan/Views/TraceView.cpp +++ b/SandboxiePlus/SandMan/Views/TraceView.cpp @@ -119,10 +119,11 @@ CMonitorList::CMonitorList(QWidget* parent) m_pTreeList->setSelectionMode(QAbstractItemView::ExtendedSelection); -#ifdef WIN32 + QStyle* pStyle = QStyleFactory::create("windows"); m_pTreeList->setStyle(pStyle); -#endif + m_pTreeList->setItemDelegate(new CTreeItemDelegate()); + m_pTreeList->setExpandsOnDoubleClick(false); m_pTreeList->setSortingEnabled(true);