fergalmoran/picard
1
0
Fork 0
mirror of https://github.com/fergalmoran/picard.git synced 2026-02-19 22:23:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

PICARD-2138: Keep toolbar fixed on macOS after updating it

Browse Source
This commit is contained in:
Philipp Wolfer
2021-03-13 11:31:20 +01:00
committed by Philipp Wolfer
parent 623f8a53a7
commit 15432ff119
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
picard/ui/mainwindow.py
View File

@@ -216,8 +216,6 @@ class MainWindow(QtWidgets.QMainWindow, PreserveGeometry):
if IS_MACOS:
self.setUnifiedTitleAndToolBarOnMac(True)
self.toolbar.setMovable(False)
self.search_toolbar.setMovable(False)
mainLayout = QtWidgets.QSplitter(QtCore.Qt.Vertical)
mainLayout.setChildrenCollapsible(False)
@@ -832,6 +830,8 @@ class MainWindow(QtWidgets.QMainWindow, PreserveGeometry):
self.insertToolBar(self.search_toolbar, self.toolbar)
self.update_toolbar_style()
toolbar.setObjectName("main_toolbar")
if IS_MACOS:
self.toolbar.setMovable(False)
def add_toolbar_action(action):
toolbar.addAction(action)
@@ -865,6 +865,9 @@ class MainWindow(QtWidgets.QMainWindow, PreserveGeometry):
self.search_toolbar = toolbar = self.addToolBar(_("Search"))
self.search_toolbar_toggle_action = self.search_toolbar.toggleViewAction()
toolbar.setObjectName("search_toolbar")
if IS_MACOS:
self.search_toolbar.setMovable(False)
search_panel = QtWidgets.QWidget(toolbar)
hbox = QtWidgets.QHBoxLayout(search_panel)
self.search_combo = QtWidgets.QComboBox(search_panel)