UI: UIHyperLink improvements

- fixed AutoSize (using UILabel's code) - added Callback for click
wwfs · Sep 16, 2019 · b0574c8 · b0574c8
1 parent 4719543
commit b0574c8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/UI/BaseDialog.cpp b/UI/BaseDialog.cpp
@@ -601,19 +601,9 @@ void UILabel::Create(UICreateContext& ctx)
 
 UIHyperLink::UIHyperLink(const char* text, const char* link /*, ETextAlign align*/)
 :	UILabel(text /*, align*/)
-,	Link(link)
+,	Link(link ? link : "")
 {}
 
-void UIHyperLink::UpdateSize(UIBaseDialog* dialog)
-{
-	if (MinWidth == 0)
-	{
-		int labelWidth;
-		MeasureTextSize(*Label, &labelWidth, NULL, dialog->GetWnd());
-		MinWidth = labelWidth;
-	}
-}
-
 void UIHyperLink::Create(UICreateContext& ctx)
 {
 	Id = ctx.dialog->GenerateDialogId();
@@ -650,9 +640,19 @@ void UIHyperLink::Create(UICreateContext& ctx)
 
 bool UIHyperLink::HandleCommand(int id, int cmd, LPARAM lParam)
 {
+	// Note: disabled control will display blue hyper link anyway. To override that, should use extra code
+	// https://social.msdn.microsoft.com/Forums/vstudio/en-US/bd54bd30-e21f-4dc7-a77f-88de02c63f72/changing-link-label-color-for-syslink?forum=vcgeneral
+
 	if (cmd == NM_CLICK || cmd == NM_RETURN || cmd == STN_CLICKED) // STN_CLICKED for WC_STATIC fallback
 	{
-		ShellExecute(NULL, "open", *Link, NULL, NULL, SW_SHOW);
+		if (Callback)
+		{
+			Callback(this);
+		}
+		else if (!Link.IsEmpty())
+		{
+			ShellExecute(NULL, "open", *Link, NULL, NULL, SW_SHOW);
+		}
 	}
 	return true;
 }

diff --git a/UI/BaseDialog.h b/UI/BaseDialog.h
@@ -391,14 +391,14 @@ class UILabel : public UIElement
 class UIHyperLink : public UILabel
 {
 	DECLARE_UI_CLASS(UIHyperLink, UILabel);
+	DECLARE_CALLBACK(Callback);
 public:
-	UIHyperLink(const char* text, const char* link /*, ETextAlign align = TA_Left*/); // align is not working
+	UIHyperLink(const char* text, const char* link = NULL /*, ETextAlign align = TA_Left*/); // align is not working
 	UIHyperLink& SetAutoSize() { return (ThisClass&)Super::SetAutoSize(); }
 
 protected:
 	FString		Link;
 
-	virtual void UpdateSize(UIBaseDialog* dialog) override;
 	virtual void Create(UICreateContext& ctx) override;
 	virtual bool HandleCommand(int id, int cmd, LPARAM lParam) override;
 };