X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Ftheme.h;fp=nageru%2Ftheme.h;h=2fac7963346a2f3034041bd9ed089c8e24650d59;hb=f8da8feaff269b75480625e1384951c20c3a529d;hp=1bed9929681fd11a3649b83d14b4de2d78125836;hpb=7a845519ce53c4efd5c5db9eb8fc815fdd69fe2f;p=nageru

diff --git a/nageru/theme.h b/nageru/theme.h
index 1bed992..2fac796 100644
--- a/nageru/theme.h
+++ b/nageru/theme.h
@@ -149,10 +149,27 @@ public:
 #endif
 
 	struct MenuEntry {
+		MenuEntry(const std::string &text, lua_State *L, int lua_ref)
+			: text(text), is_submenu(false), entry{L, lua_ref} {}
+		MenuEntry(const std::string &text, std::vector<std::unique_ptr<MenuEntry>> submenu)
+			: text(text), is_submenu(true), submenu(std::move(submenu)) {}
+		~MenuEntry();
+
 		std::string text;
-		int lua_ref;
+		bool is_submenu;
+
+		union {
+			// is_submenu = false.
+			struct {
+				lua_State *L;
+				int lua_ref;
+			} entry;
+
+			// is_submenu = true.
+			std::vector<std::unique_ptr<MenuEntry>> submenu;
+		};
 	};
-	std::vector<MenuEntry> get_theme_menu() { return theme_menu; }  // Can be empty for no menu.
+	MenuEntry *get_theme_menu() { return theme_menu.get(); }  // Can be empty for no menu.
 	void theme_menu_entry_clicked(int lua_ref);
 
 	// Will be invoked every time the theme sets a new menu.
@@ -197,7 +214,7 @@ private:
 		html_signal_connections;
 #endif
 
-	std::vector<MenuEntry> theme_menu;
+	std::unique_ptr<MenuEntry> theme_menu;
 	std::function<void()> theme_menu_callback;
 
 	friend class LiveInputWrapper;