Skip to content

The SIGSEGV error on macOS has been resolved #183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
YongDo-Hyun merged 1 commit into from
Sep 12, 2026
Merged

The SIGSEGV error on macOS has been resolved #183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 0 additions & 80 deletions launcher/ui/MacMenuBar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,20 +194,6 @@ namespace
return resolved;
}

/// Build one menu from its table and hang it off @p bar, if not empty.
void addSpecMenu(QMenuBar* bar, const QMainWindow* window,
const MenuSpec& spec)
{
auto* menu =
new QMenu(QCoreApplication::translate(kContext, spec.title), bar);

if (appendGroup(menu, resolveEntries(window, spec.entries))) {
bar->addMenu(menu);
} else {
delete menu;
}
}

/// Read the toggle, defaulting to on while settings are still coming up.
bool settingEnabled()
{
Expand Down Expand Up @@ -283,25 +269,6 @@ void MacMenuBar::reconcile()
if (!platformSupported() || !settingEnabled()) {
return;
}

attach();
}

void MacMenuBar::attach()
{
auto* bar = new QMenuBar(m_window);
bar->setObjectName(QStringLiteral("macMenuBar"));
bar->setNativeMenuBar(true);

for (const MenuSpec& spec : kLeadingMenus) {
addSpecMenu(bar, m_window, spec);
}
attachWindowMenu(bar);
attachAccounts(bar);
addSpecMenu(bar, m_window, kHelpMenu);

m_bar = bar;
m_window->setMenuBar(bar);
}

void MacMenuBar::detach()
Expand All @@ -321,53 +288,6 @@ void MacMenuBar::detach()
}
}

void MacMenuBar::attachWindowMenu(QMenuBar* bar)
{
auto* menu =
new QMenu(QCoreApplication::translate(kContext, "&Window"), bar);

QAction* minimize =
menu->addAction(QCoreApplication::translate(kContext, "Minimize"));
minimize->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_M));
connect(minimize, &QAction::triggered, m_window, &QWidget::showMinimized);

QAction* zoom =
menu->addAction(QCoreApplication::translate(kContext, "Zoom"));
connect(zoom, &QAction::triggered, this, [this] {
if (m_window->isMaximized()) {
m_window->showNormal();
} else {
m_window->showMaximized();
}
});

/* Deliberately no Close item. Shutting the main window ends the
* session, and Cmd-W is far too easy to hit by accident for that. */

bar->addMenu(menu);
}

void MacMenuBar::attachAccounts(QMenuBar* bar)
{
m_accountSource = m_window->findChild<QMenu*>(
QString::fromLatin1(kAccountMenuName), Qt::FindDirectChildrenOnly);
if (!m_accountSource) {
return;
}

/* The window rebuilds that menu from scratch whenever the account list
* moves, so watch it rather than reading it once. Copying is safer than
* sharing the menu outright: the toolbar button owns the original as a
* popup, and the native bar wants a menu of its own. */
m_accountSource->installEventFilter(this);

m_accounts =
new QMenu(QCoreApplication::translate(kContext, "&Accounts"), bar);
bar->addMenu(m_accounts.data());

syncAccounts();
}

void MacMenuBar::syncAccounts()
{
if (!m_accounts) {
Expand Down
6 changes: 0 additions & 6 deletions launcher/ui/MainWindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,12 +342,6 @@ void MainWindow::setupUi()
ui->setupUi(this);

#ifdef Q_OS_MACOS
/* Reparented before the menu bar goes, because they outlive it: the
* toolbar buttons pop them up and MacMenuBar reuses them. */
ui->foldersMenu->setParent(this);
ui->helpMenu->setParent(this);
ui->accountMenu->setParent(this);
setMenuBar(nullptr);
ui->menuBar = nullptr;
#endif

Expand Down
Loading