Merge remote-tracking branch 'origin' into ben-mkiv-main

* origin:
  Fix add leading padding to reported hex values.
  Add leading padding to reported hex values.
  U+00FF formatting for codepoints, mono font for info, various style tweaks to character info box.
  Remove inline on namespace functions.

Author: timoxley

Source/UnicodeBrowser/UnicodeBrowserWidget.cpp

@@ -65,6 +65,15 @@ TArrayView<FUnicodeBlockRange const> UnicodeBrowser::GetUnicodeBlockRanges()
 	return BlockRange;
 }
 
+int32 UnicodeBrowser::GetRangeIndex(EUnicodeBlockRange BlockRange)
+{
+	return GetUnicodeBlockRanges().IndexOfByPredicate(
+		[BlockRange](FUnicodeBlockRange const& Range)
+		{
+			return Range.Index == BlockRange;
+		}
+	);
+}
 
 TSharedPtr<SUbCheckBoxList> SUnicodeBrowserWidget::MakeRangeSelector()
 {
@@ -108,7 +117,7 @@ FReply SUnicodeBrowserWidget::OnCharacterMouseMove(FGeometry const& Geometry, FP
 	if (CurrentRow == Row) return FReply::Unhandled();
 	CurrentRow = Row;
 	CurrentCharacterView->SetText(FText::FromString(CurrentRow->Character));
-	CurrentCharacterView->SetToolTipText(FText::FromString(FString::Printf(TEXT("Char Code: 0x%04X. Double-Click to copy: %s."), CurrentRow->Codepoint, *CurrentRow->Character)));
+	CurrentCharacterView->SetToolTipText(FText::FromString(FString::Printf(TEXT("Char Code: U+%-06.04X. Double-Click to copy: %s."), CurrentRow->Codepoint, *CurrentRow->Character)));
 	return FReply::Handled();
 }
 
@@ -161,7 +170,7 @@ void SUnicodeBrowserWidget::RebuildGridColumns(FUnicodeBlockRange const Range, T
 					.Font(this, &SUnicodeBrowserWidget::GetFont)
 					.Justification(ETextJustify::Center)
 					.IsEnabled(true)
-					.ToolTipText(FText::FromString(FString::Printf(TEXT("Char Code: 0x%04X. Double-Click to copy: %s."), Row->Codepoint, *Row->Character)))
+					.ToolTipText(FText::FromString(FString::Printf(TEXT("Char Code: U+%-06.04X. Double-Click to copy: %s."), Row->Codepoint, *Row->Character)))
 					.Text(FText::FromString(FString::Printf(TEXT("%s"), *Row->Character)))
 				];
 
@@ -306,7 +315,7 @@ void SUnicodeBrowserWidget::Construct(FArguments const& InArgs)
 						.Font(this, &SUnicodeBrowserWidget::GetFont)
 						.Justification(ETextJustify::Center)
 						.IsEnabled(true)
-						.ToolTipText(FText::FromString(FString::Printf(TEXT("Char Code: %04X. Double-Click to copy: %s."), CurrentRow->Codepoint, *CurrentRow->Character)))
+						.ToolTipText(FText::FromString(FString::Printf(TEXT("Char Code: U+%-06.04X. Double-Click to copy: %s."), CurrentRow->Codepoint, *CurrentRow->Character)))
 						.Text(FText::FromString(FString::Printf(TEXT("%s"), *CurrentRow->Character)))
 					]
 				]
@@ -474,10 +483,6 @@ FString SUnicodeBrowserWidget::GetUnicodeCharacterName(int32 const CharCode)
 {
 	UChar32 const uChar = static_cast<UChar32>(CharCode);
 	UErrorCode errorCode = U_ZERO_ERROR;
-	// uint32 bufferSize = 256;
-	// char *name= (char *)uprv_malloc(bufferSize*sizeof(char));
-	// (char *)uprv_malloc(bufferSize*sizeof(char));
-	// char name[256];
 	char* name = new char[256];
 
 	// Get the Unicode character name using ICU

Source/UnicodeBrowser/UnicodeBrowserWidget.h

@@ -11,7 +11,7 @@
 #include "Widgets/SCompoundWidget.h"
 #include "Widgets/Views/SListView.h"
 
-
+class SExpandableArea;
 class UFont;
 class SScrollBox;
 class SUbCheckBoxList;
@@ -20,19 +20,11 @@ class SUniformGridPanel;
 
 namespace UnicodeBrowser
 {
-	inline TOptional<EUnicodeBlockRange> GetUnicodeBlockRangeFromChar(int32 const CharCode);
+	TOptional<EUnicodeBlockRange> GetUnicodeBlockRangeFromChar(int32 const CharCode);
 
 	TArrayView<FUnicodeBlockRange const> GetUnicodeBlockRanges();
 
-	inline int32 GetRangeIndex(EUnicodeBlockRange BlockRange)
-	{
-		return GetUnicodeBlockRanges().IndexOfByPredicate(
-			[BlockRange](FUnicodeBlockRange const& Range)
-			{
-				return Range.Index == BlockRange;
-			}
-		);
-	}
+	int32 GetRangeIndex(EUnicodeBlockRange BlockRange);
 
 	static TArray<EUnicodeBlockRange> SymbolRanges = {
 		EUnicodeBlockRange::Arrows,
@@ -69,7 +61,7 @@ class SUnicodeBrowserWidget : public SCompoundWidget
 	void Construct(FArguments const& InArgs);
 
 protected:
-	TArrayView<FUnicodeBlockRange const> Ranges; // all known unicode ranges
+	TArrayView<FUnicodeBlockRange const> Ranges; // all known Unicode ranges
 	TMap<EUnicodeBlockRange, TArray<TSharedPtr<FUnicodeBrowserRow>>> Rows;	
 	TMap<EUnicodeBlockRange, TSharedPtr<SExpandableArea>> RangeWidgets;
 	TMap<EUnicodeBlockRange, TSharedPtr<SUniformGridPanel>> RangeWidgetsGrid;