Move toolbar back to top of main window when unmovable

* Fix #9384
keepassxreboot · Aug 6, 2023 · c041f45 · c041f45
1 parent 286b5cf
commit c041f45
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
@@ -1672,7 +1672,12 @@ void MainWindow::applySettingsChanges()
     }
 
     m_ui->toolBar->setHidden(config()->get(Config::GUI_HideToolbar).toBool());
-    m_ui->toolBar->setMovable(config()->get(Config::GUI_MovableToolbar).toBool());
+    auto movable = config()->get(Config::GUI_MovableToolbar).toBool();
+    m_ui->toolBar->setMovable(movable);
+    if (!movable) {
+        // Move the toolbar back to the top of the main window
+        addToolBar(Qt::TopToolBarArea, m_ui->toolBar);
+    }
 
     bool isOk = false;
     const auto toolButtonStyle =