Fix #4482, second attempt. Construct menus in idle event handler

codereader · Feb 9, 2017 · c61af5c · c61af5c
1 parent c5a3a4e
commit c61af5c
Show file tree

Hide file tree

Showing 8 changed files with 67 additions and 18 deletions.
diff --git a/include/version.h b/include/version.h
@@ -2,7 +2,7 @@
 #include <config.h>
 #define RADIANT_VERSION PACKAGE_VERSION
 #else
-#define RADIANT_VERSION "2.2.1"
+#define RADIANT_VERSION "2.2.2pre1"
 #endif
 
 #define RADIANT_APPNAME "DarkRadiant"

diff --git a/plugins/uimanager/menu/MenuBar.cpp b/plugins/uimanager/menu/MenuBar.cpp
@@ -14,6 +14,12 @@ MenuBar::MenuBar() :
 	_menuBar(nullptr)
 {}
 
+MenuBar::~MenuBar()
+{
+	// When destroyed, make sure to unsubscribe from any idle events
+	setNeedsRefresh(false);
+}
+
 wxMenuBar* MenuBar::getMenuBar()
 {
 	if (_menuBar == nullptr)
@@ -24,9 +30,29 @@ wxMenuBar* MenuBar::getMenuBar()
 	return _menuBar;
 }
 
-void MenuBar::ensureMenusConstructed()
+bool MenuBar::isConstructed()
 {
-	construct();
+	return _menuBar != nullptr;
+}
+
+void MenuBar::setNeedsRefresh(bool needsRefresh)
+{
+	MenuElement::setNeedsRefresh(needsRefresh);
+
+	// Let's get notified on idle events
+	if (_menuBar == nullptr || _menuBar->GetFrame() == nullptr)
+	{
+		return;
+	}
+
+	if (needsRefresh)
+	{
+		_menuBar->GetFrame()->Connect(wxEVT_IDLE, wxIdleEventHandler(MenuBar::onIdle), nullptr, this);
+	}
+	else
+	{
+		_menuBar->GetFrame()->Disconnect(wxEVT_IDLE, wxIdleEventHandler(MenuBar::onIdle), nullptr, this);
+	}
 }
 
 void MenuBar::construct()
@@ -97,4 +123,23 @@ void MenuBar::onMenuOpen(wxMenuEvent& ev)
 	}
 }
 
+void MenuBar::onIdle(wxIdleEvent& ev)
+{
+	if (!needsRefresh())
+	{
+		ev.Skip();
+		return;
+	}
+
+	// Unsubscribe from idle events
+	setNeedsRefresh(false);
+
+	construct();
+
+	if (_menuBar != nullptr && _menuBar->GetFrame() != nullptr)
+	{
+		_menuBar->Refresh();
+	}
+}
+
 }
diff --git a/plugins/uimanager/menu/MenuBar.h b/plugins/uimanager/menu/MenuBar.h
@@ -2,23 +2,28 @@
 
 #include "MenuElement.h"
 #include <wx/menu.h>
+#include <wx/event.h>
 
 namespace ui
 {
 
 class MenuBar :
-	public MenuElement
+	public MenuElement,
+	public wxEvtHandler
 {
 private:
 	wxMenuBar* _menuBar;
 
 public:
 	MenuBar();
 
+	~MenuBar();
+
 	virtual wxMenuBar* getMenuBar();
 
-	// Makes sure this menubar and all child menus are constructed
-	void ensureMenusConstructed();
+	bool isConstructed();
+
+	virtual void setNeedsRefresh(bool needsRefresh) override;
 
 protected:
 	virtual void construct() override;
@@ -27,6 +32,7 @@ class MenuBar :
 private:
 	MenuElementPtr findMenu(wxMenu* menu);
 	void onMenuOpen(wxMenuEvent& ev);
+	void onIdle(wxIdleEvent& ev);
 };
 
 }

diff --git a/plugins/uimanager/menu/MenuElement.h b/plugins/uimanager/menu/MenuElement.h
@@ -106,7 +106,7 @@ class MenuElement :
 	void setEvent(const std::string& eventName);
 
 	bool needsRefresh();
-	void setNeedsRefresh(bool needsRefresh);
+	virtual void setNeedsRefresh(bool needsRefresh);
 
 	// Tries to (recursively) locate the MenuElement by looking up the path
 	MenuElementPtr find(const std::string& menuPath);

diff --git a/plugins/uimanager/menu/MenuManager.cpp b/plugins/uimanager/menu/MenuManager.cpp
@@ -187,15 +187,13 @@ void MenuManager::handleElementAdded(const MenuElementPtr& element)
 		parentMenu->setNeedsRefresh(true);
 	}
 
-#if 0
 	// When inserting a new menu in a menubar, make sure it is constructed
 	if (element->getParent() &&
 		std::dynamic_pointer_cast<MenuBar>(element->getParent()) &&
-		std::static_pointer_cast<MenuBar>(element->getParent())->getMenuBar() != nullptr)
+		std::static_pointer_cast<MenuBar>(element->getParent())->isConstructed())
 	{
-		std::static_pointer_cast<MenuBar>(element->getParent())->ensureMenusConstructed();
+		std::static_pointer_cast<MenuBar>(element->getParent())->setNeedsRefresh(true);
 	}
-#endif
 }
 
 void MenuManager::handleElementRemoved(const MenuElementPtr& element)

diff --git a/plugins/uimanager/menu/MenuManager.h b/plugins/uimanager/menu/MenuManager.h
@@ -80,7 +80,7 @@ class MenuManager :
 	void loadFromRegistry();
 
 	/**
-	 * Clears all references to GtkWidgets etc.
+	 * Clears all references to widgets etc.
 	 */
 	void clear();
 

diff --git a/tools/innosetup/darkradiant.iss b/tools/innosetup/darkradiant.iss
@@ -3,15 +3,15 @@
 
 [Setup]
 AppName=DarkRadiant
-AppVerName=DarkRadiant 2.2.1 x86
+AppVerName=DarkRadiant 2.2.2pre1 x86
 AppPublisher=The Dark Mod
 AppPublisherURL=http://www.thedarkmod.com
 AppSupportURL=http://www.thedarkmod.com
 AppUpdatesURL=http://www.thedarkmod.com
 DefaultDirName={pf}\DarkRadiant
-DefaultGroupName=DarkRadiant 2.2.1 x86
+DefaultGroupName=DarkRadiant 2.2.2pre1 x86
 OutputDir=.
-OutputBaseFilename=darkradiant-2.2.1-x86
+OutputBaseFilename=darkradiant-2.2.2pre1-x86
 Compression=lzma
 SolidCompression=yes
 ;ArchitecturesAllowed=x64

diff --git a/tools/innosetup/darkradiant.x64.iss b/tools/innosetup/darkradiant.x64.iss
@@ -3,15 +3,15 @@
 
 [Setup]
 AppName=DarkRadiant
-AppVerName=DarkRadiant 2.2.1 x64
+AppVerName=DarkRadiant 2.2.2pre1 x64
 AppPublisher=The Dark Mod
 AppPublisherURL=http://www.thedarkmod.com
 AppSupportURL=http://www.thedarkmod.com
 AppUpdatesURL=http://www.thedarkmod.com
 DefaultDirName={pf}\DarkRadiant
-DefaultGroupName=DarkRadiant 2.2.1 x64
+DefaultGroupName=DarkRadiant 2.2.2pre1 x64
 OutputDir=.
-OutputBaseFilename=darkradiant-2.2.1-x64
+OutputBaseFilename=darkradiant-2.2.2pre1-x64
 Compression=lzma
 SolidCompression=yes
 ArchitecturesAllowed=x64