From 395ca6182840927e641de74d53285b5ae0d7fe19 Mon Sep 17 00:00:00 2001 From: jyelon Date: Tue, 3 Mar 2026 00:56:43 -0500 Subject: [PATCH] Starting refactor to remove CommonUI --- Content/Luprex/lxGameMode.uasset | 4 ++-- Content/Widgets/WB_Hotkeys.uasset | 4 ++-- Content/Widgets/WB_Root.uasset | 3 --- Source/Integration/Common.h | 4 ++-- Source/Integration/FormatDataLibrary.cpp | 30 ++++++++++++++++++++++++ Source/Integration/FormatDataLibrary.h | 6 +++++ Source/Integration/Integration.Build.cs | 1 - 7 files changed, 42 insertions(+), 10 deletions(-) delete mode 100644 Content/Widgets/WB_Root.uasset diff --git a/Content/Luprex/lxGameMode.uasset b/Content/Luprex/lxGameMode.uasset index c8fbf134..c0a98507 100644 --- a/Content/Luprex/lxGameMode.uasset +++ b/Content/Luprex/lxGameMode.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:582c94da32ae045895687411e6b5c62c4e835c95a5817b5493f031df59df0b93 -size 150819 +oid sha256:14b8fbd6e4b4c0f13a9da5f6e0b027ce3ba74edfb38825ead9e6dbef59df890d +size 188885 diff --git a/Content/Widgets/WB_Hotkeys.uasset b/Content/Widgets/WB_Hotkeys.uasset index 8e0bc2bc..7a757a7d 100644 --- a/Content/Widgets/WB_Hotkeys.uasset +++ b/Content/Widgets/WB_Hotkeys.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ab45f996326e89394f518dccbe83f0b741eb3f681ea829d8259e7c85d222585d -size 275157 +oid sha256:9ab90b714d61bd3b7b9da7dd660b31858ba0bd585bb3b3aae0a7674855bef885 +size 275273 diff --git a/Content/Widgets/WB_Root.uasset b/Content/Widgets/WB_Root.uasset deleted file mode 100644 index 68f1a50c..00000000 --- a/Content/Widgets/WB_Root.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:039907ebcd6a9523d780799d60c628b830c6471ffc8256e2a6a508440062dac6 -size 83262 diff --git a/Source/Integration/Common.h b/Source/Integration/Common.h index 0daa9d70..3cf0c0b4 100644 --- a/Source/Integration/Common.h +++ b/Source/Integration/Common.h @@ -11,7 +11,7 @@ #pragma once #include -#include "CommonActivatableWidget.h" +#include "Blueprint/UserWidget.h" #include "Common.generated.h" //////////////////////////////////////////////////////////// @@ -141,7 +141,7 @@ DECLARE_LOG_CATEGORY_EXTERN(LogLuprexIntegration, Display, All); class UlxLuaValues; UCLASS(BlueprintType) -class INTEGRATION_API UlxLuaWidget : public UCommonActivatableWidget +class INTEGRATION_API UlxLuaWidget : public UUserWidget { GENERATED_BODY() diff --git a/Source/Integration/FormatDataLibrary.cpp b/Source/Integration/FormatDataLibrary.cpp index d9dc01f3..fd32a9a4 100644 --- a/Source/Integration/FormatDataLibrary.cpp +++ b/Source/Integration/FormatDataLibrary.cpp @@ -1,5 +1,7 @@ #include "FormatDataLibrary.h" +#include "Layout/Geometry.h" +#include "Widgets/Layout/Anchors.h" #include "Common.h" #include "Kismet/KismetTextLibrary.h" #include "UObject/UObjectIterator.h" @@ -191,6 +193,34 @@ FFormatArgumentData UlxFormatDataLibrary::FormatArgumentDataTransform(const FTra return Result; } +FFormatArgumentData UlxFormatDataLibrary::FormatArgumentDataGeometry(const FGeometry &AutoConvertedValue, const FString &Name) +{ + FVector2D LocalSize = AutoConvertedValue.GetLocalSize(); + FVector2D AbsPos = AutoConvertedValue.GetAbsolutePosition(); + FVector2D AbsSize = AutoConvertedValue.GetAbsoluteSize(); + FFormatArgumentData Result; + Result.ArgumentValueType = EFormatArgumentType::Text; + Result.ArgumentName = Name; + Result.ArgumentValue = FText::Format( + INVTEXT("Geom(Local={0}x{1} Abs={2}x{3} Pos={4},{5})"), + FText::AsNumber(LocalSize.X), FText::AsNumber(LocalSize.Y), + FText::AsNumber(AbsSize.X), FText::AsNumber(AbsSize.Y), + FText::AsNumber(AbsPos.X), FText::AsNumber(AbsPos.Y)); + return Result; +} + +FFormatArgumentData UlxFormatDataLibrary::FormatArgumentDataAnchors(const FAnchors &AutoConvertedValue, const FString &Name) +{ + FFormatArgumentData Result; + Result.ArgumentValueType = EFormatArgumentType::Text; + Result.ArgumentName = Name; + Result.ArgumentValue = FText::Format( + INVTEXT("Anchors(Min={0},{1} Max={2},{3})"), + FText::AsNumber(AutoConvertedValue.Minimum.X), FText::AsNumber(AutoConvertedValue.Minimum.Y), + FText::AsNumber(AutoConvertedValue.Maximum.X), FText::AsNumber(AutoConvertedValue.Maximum.Y)); + return Result; +} + FFormatArgumentData UlxFormatDataLibrary::FormatArgumentDataBlank(const FString &Name) { FFormatArgumentData Result; diff --git a/Source/Integration/FormatDataLibrary.h b/Source/Integration/FormatDataLibrary.h index 257e6455..496df5ce 100644 --- a/Source/Integration/FormatDataLibrary.h +++ b/Source/Integration/FormatDataLibrary.h @@ -115,6 +115,12 @@ public: UFUNCTION(BlueprintPure, meta = (BlueprintInternalUseOnly = "true"), Category = "Luprex|Utility") static FFormatArgumentData FormatArgumentDataTransform(const FTransform &AutoConvertedValue, const FString &Name); + UFUNCTION(BlueprintPure, meta = (BlueprintInternalUseOnly = "true"), Category = "Luprex|Utility") + static FFormatArgumentData FormatArgumentDataGeometry(const FGeometry &AutoConvertedValue, const FString &Name); + + UFUNCTION(BlueprintPure, meta = (BlueprintInternalUseOnly = "true"), Category = "Luprex|Utility") + static FFormatArgumentData FormatArgumentDataAnchors(const FAnchors &AutoConvertedValue, const FString &Name); + // For pins that were never connected. // UFUNCTION(BlueprintPure, meta = (BlueprintInternalUseOnly = "true"), Category = "Luprex|Utility") diff --git a/Source/Integration/Integration.Build.cs b/Source/Integration/Integration.Build.cs index 573feb98..69bd153c 100644 --- a/Source/Integration/Integration.Build.cs +++ b/Source/Integration/Integration.Build.cs @@ -19,7 +19,6 @@ public class Integration : ModuleRules "Networking", "EnhancedInput", "UMG", - "CommonUI", "RenderCore" });