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 <[email protected]>
This commit is contained in:
committed by
Adrien Destugues
parent
c2151600ed
commit
27ae691c1f
@@ -542,6 +542,15 @@ case MSG_SHAPE_SELECTED: {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void
|
||||||
|
MainWindow::Show()
|
||||||
|
{
|
||||||
|
BWindow::Show();
|
||||||
|
BMenuBar* bar = static_cast<BMenuBar*>(FindView("main menu"));
|
||||||
|
SetKeyMenuBar(bar);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
bool
|
bool
|
||||||
MainWindow::QuitRequested()
|
MainWindow::QuitRequested()
|
||||||
{
|
{
|
||||||
@@ -975,7 +984,8 @@ MainWindow::_CreateGUI()
|
|||||||
layout->AddView(leftTopView, 0, 0);
|
layout->AddView(leftTopView, 0, 0);
|
||||||
|
|
||||||
// views along the left side
|
// views along the left side
|
||||||
leftTopView->AddChild(_CreateMenuBar());
|
BMenuBar* mainMenuBar = _CreateMenuBar();
|
||||||
|
leftTopView->AddChild(mainMenuBar);
|
||||||
|
|
||||||
float splitWidth = 13 * be_plain_font->Size();
|
float splitWidth = 13 * be_plain_font->Size();
|
||||||
BSize minSize = leftTopView->MinSize();
|
BSize minSize = leftTopView->MinSize();
|
||||||
@@ -1131,6 +1141,7 @@ MainWindow::_CreateGUI()
|
|||||||
swatchGroupView->MinSize().height));
|
swatchGroupView->MinSize().height));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
BMenuBar*
|
BMenuBar*
|
||||||
MainWindow::_CreateMenuBar()
|
MainWindow::_CreateMenuBar()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -55,6 +55,7 @@ public:
|
|||||||
|
|
||||||
// BWindow interface
|
// BWindow interface
|
||||||
virtual void MessageReceived(BMessage* message);
|
virtual void MessageReceived(BMessage* message);
|
||||||
|
virtual void Show();
|
||||||
virtual bool QuitRequested();
|
virtual bool QuitRequested();
|
||||||
virtual void WorkspaceActivated(int32 workspace,
|
virtual void WorkspaceActivated(int32 workspace,
|
||||||
bool active);
|
bool active);
|
||||||
|
|||||||
Reference in New Issue
Block a user