Fix tolua "virtuality" of gcn::Widget::setFont.

Wargus · Feb 28, 2024 · 7a921e2 · 7a921e2
1 parent 34ec4cb
commit 7a921e2
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/src/include/widgets.h b/src/include/widgets.h
@@ -51,6 +51,7 @@ void setBackgroundColor(gcn::Widget *, const gcn::Color &);
 void setBaseColor(gcn::Widget *, const gcn::Color &color);
 void setDirty(gcn::Widget *, bool isDirty);
 void setDisabledColor(gcn::Widget *, const gcn::Color &);
+void setFont(gcn::Widget *widget, gcn::Font *font);
 void setHotKey(gcn::Widget *, const char *key);
 void scrollToBottom(gcn::ScrollArea *);
 void scrollToTop(gcn::ScrollArea *);

diff --git a/src/tolua/ui.pkg b/src/tolua/ui.pkg
@@ -298,7 +298,7 @@ class Widget
 	tolua_outside virtual void setDisabledColor @ setDisabledColor(const Color color);
 
 	static void setGlobalFont(CFont *font);
-	void setFont(CFont *font);
+	tolua_outside virtual void setFont @ setFont(CFont *font);
 
 	virtual int getHotKey() const;
 	virtual void setHotKey(const int key);

diff --git a/src/ui/widgets.cpp b/src/ui/widgets.cpp
@@ -115,6 +115,19 @@ void setBackgroundColor(gcn::Widget *widget, const gcn::Color &color)
 	}
 }
 
+void setFont(gcn::Widget *widget, gcn::Font *font)
+{
+	// gcn::Widget::setFont is no longer virtual
+	// so dispatch manually :-/
+
+	if (auto w = dynamic_cast<ImageDropDownWidget *>(widget)) {
+		w->setFont(font);
+	} else if (auto w = dynamic_cast<gcn::DropDown *>(widget)) {
+		w->setFont(font);
+	} else {
+		widget->setFont(font);
+	}
+}
 
 static void MenuHandleMouseMove(const PixelPos &screenPos)
 {