mirror-github-bspeice/fractorium
1
0
Fork 0
mirror of https://bitbucket.org/mfeemster/fractorium.git synced 2025-01-21 21:20:07 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #27 from gh2k/osx-native-menus

Browse Source 
Force creation of native menu bar when main window is shown
This commit is contained in:
Matt Feemster 2015-07-29 17:42:49 -07:00
commit 28a25644a2
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Fractorium/Fractorium.cpp
View File

@ -349,6 +349,19 @@ void Fractorium::resizeEvent(QResizeEvent* e)
QMainWindow::resizeEvent(e); QMainWindow::resizeEvent(e);
} }
/// <summary>
/// Respond to a show event to ensure Qt updates the native menubar.
/// On first create, Qt can fail to create the native menu bar properly,
/// but telling it that this window has become the focus window forces
/// it to refresh this.
/// <param name="e">The event</param>
void Fractorium::showEvent(QShowEvent *e)
{
// tell Qt to refresh the native menubar from this widget
emit qGuiApp->focusWindowChanged(windowHandle());
QMainWindow::showEvent(e);
}
/// <summary> /// <summary>
/// Stop rendering and block before exiting. /// Stop rendering and block before exiting.
/// Called on program exit. /// Called on program exit.

1
Source/Fractorium/Fractorium.h
View File

@ -306,6 +306,7 @@ protected:
virtual void dragEnterEvent(QDragEnterEvent* e) override; virtual void dragEnterEvent(QDragEnterEvent* e) override;
virtual void dragMoveEvent(QDragMoveEvent* e) override; virtual void dragMoveEvent(QDragMoveEvent* e) override;
virtual void dropEvent(QDropEvent* e) override; virtual void dropEvent(QDropEvent* e) override;
virtual void showEvent(QShowEvent *e) override;
private: private:
void InitMenusUI(); void InitMenusUI();