combo box tooltips

ucpu · Nov 6, 2023 · a14c914 · a14c914
1 parent e821df1
commit a14c914
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/externals/cage b/externals/cage
diff --git a/sources/gui/widgets/comboBox.cpp b/sources/gui/widgets/comboBox.cpp
@@ -2,6 +2,14 @@
 
 using namespace cage;
 
+void tooltipCallback(uint32 index, const GuiTooltipConfig &cfg)
+{
+	cfg.placement = TooltipPlacementEnum::InvokerCorner;
+	auto g = newGuiBuilder(cfg.tooltip);
+	auto _ = g->panel();
+	g->label().text(Stringizer() + "option " + index);
+}
+
 class GuiTestImpl : public GuiTestClass
 {
 	void initialize() override
@@ -51,13 +59,15 @@ class GuiTestImpl : public GuiTestClass
 			p.order = index++;
 			e->value<GuiComboBoxComponent>().selected = 2;
 			e->value<GuiTextComponent>().value = "select one:";
+			e->value<GuiTooltipComponent>().tooltip = detail::guiTooltipText<"select one">();
 			for (uint32 i = 0; i < 4; i++)
 			{
 				Entity *o = ents->createUnique();
 				GuiParentComponent &p = o->value<GuiParentComponent>();
 				p.parent = e->name();
 				p.order = index++;
 				o->value<GuiTextComponent>().value = Stringizer() + "option " + i;
+				o->value<GuiTooltipComponent>().tooltip.bind<uint32, &tooltipCallback>(i);
 			}
 		}
 		{ // disabled combo
@@ -69,13 +79,15 @@ class GuiTestImpl : public GuiTestClass
 			e->value<GuiComboBoxComponent>();
 			e->value<GuiWidgetStateComponent>().disabled = true;
 			e->value<GuiTextComponent>().value = "select one:";
+			e->value<GuiTooltipComponent>().tooltip = detail::guiTooltipText<"select one">();
 			for (uint32 i = 0; i < 4; i++)
 			{
 				Entity *o = ents->createUnique();
 				GuiParentComponent &p = o->value<GuiParentComponent>();
 				p.parent = e->name();
 				p.order = index++;
 				o->value<GuiTextComponent>().value = Stringizer() + "option " + i;
+				o->value<GuiTooltipComponent>().tooltip.bind<uint32, &tooltipCallback>(i);
 			}
 		}
 		{ // disabled items
@@ -86,6 +98,7 @@ class GuiTestImpl : public GuiTestClass
 			p.order = index++;
 			e->value<GuiComboBoxComponent>();
 			e->value<GuiTextComponent>().value = "select one:";
+			e->value<GuiTooltipComponent>().tooltip = detail::guiTooltipText<"select one">();
 			for (uint32 i = 0; i < 4; i++)
 			{
 				Entity *o = ents->createUnique();
@@ -95,6 +108,7 @@ class GuiTestImpl : public GuiTestClass
 				o->value<GuiTextComponent>().value = Stringizer() + "option " + i;
 				if (i == 2)
 					o->value<GuiWidgetStateComponent>().disabled = true;
+				o->value<GuiTooltipComponent>().tooltip.bind<uint32, &tooltipCallback>(i);
 			}
 		}
 	}
+1 −1		sources/include/cage-engine/guiComponents.h
+1 −1		sources/libengine/gui/graphics.cpp
+2 −2		sources/libengine/gui/skin.cpp
+6 −8		sources/libengine/gui/tooltips.cpp
+104 −72		sources/libengine/gui/widgets/comboBox.cpp