string-only tooltip

Author: malytomas

sources/include/cage-engine/guiBuilder.h

@@ -46,18 +46,21 @@ namespace cage
 			BuilderItem update(Delegate<void(Entity *)> u);
 
 			BuilderItem tooltip(const GuiTooltipComponent &t);
+			BuilderItem tooltip(const String &txt, uint64 delay = GuiTooltipComponent().delay)
+			{
+				(*this)->value<GuiTooltipComponent>() = GuiTooltipComponent{ .tooltip = privat::guiTooltipText(entity(), txt), .delay = delay };
+				return *this;
+			}
 			template<StringLiteral Text>
 			BuilderItem tooltip(uint64 delay = GuiTooltipComponent().delay)
 			{
-				(*this)->template value<GuiTooltipComponent>().tooltip = detail::guiTooltipText<Text>();
-				(*this)->template value<GuiTooltipComponent>().delay = delay;
+				(*this)->template value<GuiTooltipComponent>() = GuiTooltipComponent{ .tooltip = detail::guiTooltipText<Text>(), .delay = delay };
 				return *this;
 			}
 			template<uint32 TextId>
 			BuilderItem tooltip(uint64 delay = GuiTooltipComponent().delay)
 			{
-				(*this)->template value<GuiTooltipComponent>().tooltip = detail::guiTooltipText<TextId>();
-				(*this)->template value<GuiTooltipComponent>().delay = delay;
+				(*this)->template value<GuiTooltipComponent>() = GuiTooltipComponent{ .tooltip = detail::guiTooltipText<TextId>(), .delay = delay };
 				return *this;
 			}
 

sources/include/cage-engine/guiComponents.h

@@ -298,6 +298,7 @@ namespace cage
 	namespace privat
 	{
 		CAGE_ENGINE_API GuiTooltipComponent::TooltipCallback guiTooltipText(const GuiTextComponent *txt);
+		CAGE_ENGINE_API GuiTooltipComponent::TooltipCallback guiTooltipText(Entity *e, const String &txt);
 	}
 
 	namespace detail

sources/libengine/gui/gui.cpp

@@ -20,6 +20,7 @@ namespace cage
 #define GCHL_GENERATE(T) entityMgr->defineComponent(CAGE_JOIN(Gui, CAGE_JOIN(T, Component))());
 		CAGE_EVAL_SMALL(CAGE_EXPAND_ARGS(GCHL_GENERATE, GCHL_GUI_COMMON_COMPONENTS, GCHL_GUI_WIDGET_COMPONENTS, GCHL_GUI_LAYOUT_COMPONENTS));
 #undef GCHL_GENERATE
+		entityMgr->defineComponent(GuiTooltipStringComponent());
 
 		skins.reserve(config.skinsCount);
 		for (uint32 i = 0; i < config.skinsCount; i++)

sources/libengine/gui/private.h

@@ -274,8 +274,15 @@ namespace cage
 		bool removing = false;
 	};
 
+	// this component is added to the root entity of shown tooltip to track its deletion
 	struct GuiTooltipMarkerComponent
-	{}; // this component is added to the root entity of shown tooltip to track its deletion
+	{};
+
+	// this component is used to hold data for text-only tooltips
+	struct GuiTooltipStringComponent
+	{
+		String data;
+	};
 
 	class GuiImpl : public GuiManager
 	{

sources/libengine/gui/tooltips.cpp

@@ -267,6 +267,15 @@ namespace cage
 			e->value<GuiLabelComponent>();
 			e->value<GuiTextComponent>() = *txt;
 		}
+
+		void guiTooltipStringImpl(const GuiTooltipConfig &cfg)
+		{
+			cfg.tooltip->value<GuiPanelComponent>();
+			Entity *e = cfg.tooltip->manager()->createUnique();
+			e->value<GuiParentComponent>().parent = cfg.tooltip->id();
+			e->value<GuiLabelComponent>();
+			e->value<GuiTextComponent>().value = cfg.invoker->value<GuiTooltipStringComponent>().data;
+		}
 	}
 
 	namespace privat
@@ -277,5 +286,13 @@ namespace cage
 			tt.bind<const GuiTextComponent *, guiTooltipTextImpl>(txt);
 			return tt;
 		}
+
+		GuiTooltipComponent::TooltipCallback guiTooltipText(Entity *e, const String &txt)
+		{
+			e->value<GuiTooltipStringComponent>().data = txt;
+			GuiTooltipComponent::TooltipCallback tt;
+			tt.bind<guiTooltipStringImpl>();
+			return tt;
+		}
 	}
 }