From 27ae691c1f847b21d12cbfbceb7ed3f06a887e3c Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Sun, 2 Aug 2020 19:15:37 +0200
Subject: [PATCH] Icon-O-Matic: fix the main menu bar

Mentionned in #8759 as well.

Change-Id: I90bb0529a6bf1dd18316a95f87947e142128d5db
Reviewed-on: https://review.haiku-os.org/c/haiku/+/3123
Reviewed-by: Adrien Destugues <pulkomandy@gmail.com>
---
 src/apps/icon-o-matic/MainWindow.cpp | 13 ++++++++++++-
 src/apps/icon-o-matic/MainWindow.h   |  1 +
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/apps/icon-o-matic/MainWindow.cpp b/src/apps/icon-o-matic/MainWindow.cpp
index 11d137c6b8..70b14b1514 100644
--- a/src/apps/icon-o-matic/MainWindow.cpp
+++ b/src/apps/icon-o-matic/MainWindow.cpp
@@ -542,6 +542,15 @@ case MSG_SHAPE_SELECTED: {
 }
 
 
+void
+MainWindow::Show()
+{
+	BWindow::Show();
+	BMenuBar* bar = static_cast<BMenuBar*>(FindView("main menu"));
+	SetKeyMenuBar(bar);
+}
+
+
 bool
 MainWindow::QuitRequested()
 {
@@ -975,7 +984,8 @@ MainWindow::_CreateGUI()
 	layout->AddView(leftTopView, 0, 0);
 
 	// views along the left side
-	leftTopView->AddChild(_CreateMenuBar());
+	BMenuBar* mainMenuBar = _CreateMenuBar();
+	leftTopView->AddChild(mainMenuBar);
 
 	float splitWidth = 13 * be_plain_font->Size();
 	BSize minSize = leftTopView->MinSize();
@@ -1131,6 +1141,7 @@ MainWindow::_CreateGUI()
 		swatchGroupView->MinSize().height));
 }
 
+
 BMenuBar*
 MainWindow::_CreateMenuBar()
 {
diff --git a/src/apps/icon-o-matic/MainWindow.h b/src/apps/icon-o-matic/MainWindow.h
index 432dd1eea7..32b8f866cb 100644
--- a/src/apps/icon-o-matic/MainWindow.h
+++ b/src/apps/icon-o-matic/MainWindow.h
@@ -55,6 +55,7 @@ public:
 
 	// BWindow interface
 	virtual	void				MessageReceived(BMessage* message);
+	virtual	void				Show();
 	virtual	bool				QuitRequested();
 	virtual	void				WorkspaceActivated(int32 workspace,
 									bool active);