Merge pull request #317 from steinbergmedia/bugfix/coptionmenu-get-ra…

…nge-and-max fix COptionMenu().getMax()
steinbergmedia · Jan 5, 2024 · 24f7973 · 24f7973
2 parents dc31b4a + b8c32f8
commit 24f7973
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/vstgui/lib/controls/coptionmenu.cpp b/vstgui/lib/controls/coptionmenu.cpp
@@ -888,6 +888,14 @@ void COptionMenu::setValue (float val)
 	setDirty ();
 }
 
+//------------------------------------------------------------------------
+float COptionMenu::getMax () const
+{
+	if (menuItems->empty ())
+		return 0.f;
+	return static_cast<float> (menuItems->size () - 1);
+}
+
 //------------------------------------------------------------------------
 void COptionMenu::takeFocus ()
 {

diff --git a/vstgui/lib/controls/coptionmenu.h b/vstgui/lib/controls/coptionmenu.h
@@ -307,7 +307,7 @@ class COptionMenu : public CParamDisplay
 	void setMin (float val) override {}
 	float getMin () const override { return 0; }
 	void setMax (float val) override {}
-	float getMax () const override { return (float)(menuItems->size () - 1); }
+	float getMax () const override;
 
 	void draw (CDrawContext* pContext) override;
 	CMouseEventResult onMouseDown (CPoint& where, const CButtonState& buttons) override;

diff --git a/vstgui/tests/unittest/lib/controls/coptionmenu_test.cpp b/vstgui/tests/unittest/lib/controls/coptionmenu_test.cpp
@@ -49,4 +49,10 @@ TEST_CASE (CCommandMenuItemTest, DescConstructor3)
 	EXPECT_EQ (item.getCommandName (), "CommandNme");
 }
 
+TEST_CASE (COptionMenuTest, GetMaxWhenEmpty)
+{
+	COptionMenu menu;
+	EXPECT_EQ (menu.getMax (), 0.f);
+}
+
 } // VSTGUI