talezero/integration
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Starting refactor to remove CommonUI

Browse Source
This commit is contained in:
jyelon
2026-03-03 00:56:43 -05:00
parent 3613528ab8
commit 395ca61828
7 changed files with 42 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Content/Luprex/lxGameMode.uasset LFS
View File

Binary file not shown.

BIN
Content/Widgets/WB_Hotkeys.uasset LFS
View File

Binary file not shown.

BIN
Content/Widgets/WB_Root.uasset LFS
View File

Binary file not shown.

4
Source/Integration/Common.h
View File

@@ -11,7 +11,7 @@
#pragma once #pragma once
#include <string_view> #include <string_view>
#include "CommonActivatableWidget.h" #include "Blueprint/UserWidget.h"
#include "Common.generated.h" #include "Common.generated.h"
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
@@ -141,7 +141,7 @@ DECLARE_LOG_CATEGORY_EXTERN(LogLuprexIntegration, Display, All);
class UlxLuaValues; class UlxLuaValues;
UCLASS(BlueprintType) UCLASS(BlueprintType)
class INTEGRATION_API UlxLuaWidget : public UCommonActivatableWidget class INTEGRATION_API UlxLuaWidget : public UUserWidget
{ {
GENERATED_BODY() GENERATED_BODY()

30
Source/Integration/FormatDataLibrary.cpp
View File

@@ -1,5 +1,7 @@
#include "FormatDataLibrary.h" #include "FormatDataLibrary.h"
#include "Layout/Geometry.h"
#include "Widgets/Layout/Anchors.h"
#include "Common.h" #include "Common.h"
#include "Kismet/KismetTextLibrary.h" #include "Kismet/KismetTextLibrary.h"
#include "UObject/UObjectIterator.h" #include "UObject/UObjectIterator.h"
@@ -191,6 +193,34 @@ FFormatArgumentData UlxFormatDataLibrary::FormatArgumentDataTransform(const FTra
return Result; 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 UlxFormatDataLibrary::FormatArgumentDataBlank(const FString &Name)
{ {
FFormatArgumentData Result; FFormatArgumentData Result;

6
Source/Integration/FormatDataLibrary.h
View File

@@ -115,6 +115,12 @@ public:
UFUNCTION(BlueprintPure, meta = (BlueprintInternalUseOnly = "true"), Category = "Luprex|Utility") UFUNCTION(BlueprintPure, meta = (BlueprintInternalUseOnly = "true"), Category = "Luprex|Utility")
static FFormatArgumentData FormatArgumentDataTransform(const FTransform &AutoConvertedValue, const FString &Name); 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. // For pins that were never connected.
// //
UFUNCTION(BlueprintPure, meta = (BlueprintInternalUseOnly = "true"), Category = "Luprex|Utility") UFUNCTION(BlueprintPure, meta = (BlueprintInternalUseOnly = "true"), Category = "Luprex|Utility")

1
Source/Integration/Integration.Build.cs
View File

@@ -19,7 +19,6 @@ public class Integration : ModuleRules
"Networking", "Networking",
"EnhancedInput", "EnhancedInput",
"UMG", "UMG",
"CommonUI",
"RenderCore" "RenderCore"
}); });