From ada595663da02e951145690cd29d99454aae829b Mon Sep 17 00:00:00 2001 From: leo78913 Date: Mon, 9 Jan 2023 00:51:46 -0300 Subject: [PATCH] fix(widebar): fix insertSeparator WideBar::insertSeparator was adding the separator to the end of the toolbar Signed-off-by: leo78913 --- launcher/ui/MainWindow.cpp | 2 ++ launcher/ui/widgets/WideBar.cpp | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp index 69ef3016..ca6827e0 100644 --- a/launcher/ui/MainWindow.cpp +++ b/launcher/ui/MainWindow.cpp @@ -166,6 +166,8 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi connect(renameButton, &QToolButton::clicked, this, &MainWindow::on_actionRenameInstance_triggered); ui->instanceToolBar->insertWidgetBefore(ui->actionLaunchInstance, renameButton); + ui->instanceToolBar->insertSeparator(ui->actionLaunchInstance); + // restore the instance toolbar settings auto const setting_name = QString("WideBarVisibility_%1").arg(ui->instanceToolBar->objectName()); if (!APPLICATION->settings()->contains(setting_name)) diff --git a/launcher/ui/widgets/WideBar.cpp b/launcher/ui/widgets/WideBar.cpp index 717958fd..4f81f444 100644 --- a/launcher/ui/widgets/WideBar.cpp +++ b/launcher/ui/widgets/WideBar.cpp @@ -158,7 +158,9 @@ void WideBar::insertSeparator(QAction* before) return; BarEntry entry; - entry.bar_action = QToolBar::insertSeparator(before); + entry.bar_action = new QAction("", this); + entry.bar_action->setSeparator(true); + insertAction(iter->bar_action, entry.bar_action); entry.type = BarEntry::Type::Separator; m_entries.insert(iter, entry);