From 15432ff119ea563eb95f1169a49407e37cd92cb2 Mon Sep 17 00:00:00 2001 From: Philipp Wolfer Date: Sat, 13 Mar 2021 11:31:20 +0100 Subject: [PATCH] PICARD-2138: Keep toolbar fixed on macOS after updating it --- picard/ui/mainwindow.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/picard/ui/mainwindow.py b/picard/ui/mainwindow.py index 57ab4a474..cfc5515f5 100644 --- a/picard/ui/mainwindow.py +++ b/picard/ui/mainwindow.py @@ -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)