From 2735f30eab6d0a16b8d961ecf6e11e08eb23e4ad Mon Sep 17 00:00:00 2001 From: Veronica Berglyd Olsen <1619840+vkbo@users.noreply.github.com> Date: Wed, 22 Jan 2025 17:01:20 +0100 Subject: [PATCH] Fix side panel header margins --- novelwriter/gui/noveltree.py | 4 ++-- novelwriter/gui/projtree.py | 2 +- novelwriter/gui/search.py | 7 +++++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/novelwriter/gui/noveltree.py b/novelwriter/gui/noveltree.py index 619700cb..8ce78da3 100644 --- a/novelwriter/gui/noveltree.py +++ b/novelwriter/gui/noveltree.py @@ -248,7 +248,7 @@ class GuiNovelToolBar(QWidget): self.outerBox.addWidget(self.tbNovel) self.outerBox.addWidget(self.tbRefresh) self.outerBox.addWidget(self.tbMore) - self.outerBox.setContentsMargins(2, 2, 0, 2) + self.outerBox.setContentsMargins(4, 2, 0, 2) self.outerBox.setSpacing(0) self.setLayout(self.outerBox) @@ -393,7 +393,7 @@ class GuiNovelTree(QTreeWidget): self.setUniformRowHeights(True) self.setAllColumnsShowFocus(True) self.setHeaderHidden(True) - self.setIndentation(0) + self.setIndentation(2) self.setColumnCount(4) self.setSelectionBehavior(QAbstractItemView.SelectionBehavior.SelectRows) self.setSelectionMode(QAbstractItemView.SelectionMode.SingleSelection) diff --git a/novelwriter/gui/projtree.py b/novelwriter/gui/projtree.py index b32bae4b..0be15929 100644 --- a/novelwriter/gui/projtree.py +++ b/novelwriter/gui/projtree.py @@ -335,7 +335,7 @@ class GuiProjectToolBar(QWidget): self.outerBox.addWidget(self.tbMoveD) self.outerBox.addWidget(self.tbAdd) self.outerBox.addWidget(self.tbMore) - self.outerBox.setContentsMargins(2, 2, 0, 2) + self.outerBox.setContentsMargins(4, 2, 0, 2) self.outerBox.setSpacing(0) self.setLayout(self.outerBox) diff --git a/novelwriter/gui/search.py b/novelwriter/gui/search.py index 3c44c82a..fdf5dbe7 100644 --- a/novelwriter/gui/search.py +++ b/novelwriter/gui/search.py @@ -28,7 +28,7 @@ import logging from time import time from PyQt6.QtCore import Qt, pyqtSignal, pyqtSlot -from PyQt6.QtGui import QAction, QCursor, QKeyEvent +from PyQt6.QtGui import QAction, QCursor, QKeyEvent, QPalette from PyQt6.QtWidgets import ( QApplication, QFrame, QHBoxLayout, QLabel, QLineEdit, QToolBar, QTreeWidget, QTreeWidgetItem, QVBoxLayout, QWidget @@ -74,7 +74,7 @@ class GuiProjectSearch(QWidget): # Header self.viewLabel = QLabel(self.tr("Project Search"), self) self.viewLabel.setFont(SHARED.theme.guiFontB) - self.viewLabel.setContentsMargins(2, 4, 0, 2) + self.viewLabel.setContentsMargins(4, 4, 0, 2) # Options self.searchOpt = QToolBar(self) @@ -138,6 +138,7 @@ class GuiProjectSearch(QWidget): self.outerBox.setContentsMargins(0, 0, 0, 0) self.outerBox.setSpacing(2) + self.setAutoFillBackground(True) self.setLayout(self.outerBox) self.updateTheme() @@ -155,6 +156,8 @@ class GuiProjectSearch(QWidget): qPalette = self.palette() colBase = cssCol(qPalette.base().color()) colFocus = cssCol(qPalette.highlight().color()) + qPalette.setBrush(QPalette.ColorRole.Window, qPalette.base()) + self.setPalette(qPalette) self.setStyleSheet( "QToolBar {padding: 0; background: none;} "