tweak functions for gui builder tooltip and text

Author: malytomas

sources/include/cage-core/hashString.h

@@ -10,7 +10,7 @@ namespace cage
 	{
 		CAGE_FORCE_INLINE constexpr explicit HashString(const char *str) : value(hashRawString(str) | ((uint32)1 << 31)) {}
 
-		CAGE_FORCE_INLINE constexpr explicit HashString(const StringPointer &str) : value(hashRawString(str) | ((uint32)1 << 31)) {}
+		CAGE_FORCE_INLINE constexpr explicit HashString(StringPointer str) : value(hashRawString(str) | ((uint32)1 << 31)) {}
 
 		template<uint32 N>
 		CAGE_FORCE_INLINE constexpr explicit HashString(const detail::StringBase<N> &str) : value(hashBuffer(str) | ((uint32)1 << 31))

sources/include/cage-engine/guiBuilder.h

@@ -46,10 +46,17 @@ namespace cage
 			BuilderItem update(Delegate<void(Entity *)> u);
 
 			BuilderItem tooltip(const GuiTooltipComponent &t);
-			template<StringLiteral Text, uint32 TextId = 0>
+			template<StringLiteral Text>
 			BuilderItem tooltip(uint64 delay = GuiTooltipComponent().delay)
 			{
-				(*this)->template value<GuiTooltipComponent>().tooltip = detail::guiTooltipText<Text, TextId>();
+				(*this)->template value<GuiTooltipComponent>().tooltip = detail::guiTooltipText<Text>();
+				(*this)->template value<GuiTooltipComponent>().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;
 				return *this;
 			}

sources/include/cage-engine/guiComponents.h

@@ -305,10 +305,17 @@ namespace cage
 		CAGE_ENGINE_API void guiDestroyChildrenRecursively(Entity *e);
 		CAGE_ENGINE_API void guiDestroyEntityRecursively(Entity *e);
 
-		template<StringLiteral Text, uint32 TextId = 0>
+		template<StringLiteral Text>
 		GuiTooltipComponent::TooltipCallback guiTooltipText()
 		{
-			static constexpr GuiTextComponent txt{ Text.value, TextId };
+			static constexpr GuiTextComponent txt{ Text.value, 0 };
+			return privat::guiTooltipText(&txt);
+		}
+
+		template<uint32 TextId>
+		GuiTooltipComponent::TooltipCallback guiTooltipText()
+		{
+			static constexpr GuiTextComponent txt{ "", TextId };
 			return privat::guiTooltipText(&txt);
 		}
 	}

sources/libengine/gui/tooltips.cpp

@@ -274,7 +274,7 @@ namespace cage
 		GuiTooltipComponent::TooltipCallback guiTooltipText(const GuiTextComponent *txt)
 		{
 			GuiTooltipComponent::TooltipCallback tt;
-			tt.bind<const GuiTextComponent *, &guiTooltipTextImpl>(txt);
+			tt.bind<const GuiTextComponent *, guiTooltipTextImpl>(txt);
 			return tt;
 		}
 	}