diff --git a/.ignore b/.ignore index 8485450..b1407d9 100644 --- a/.ignore +++ b/.ignore @@ -1,3 +1,4 @@ +/.cache /.git /.vscode /Content diff --git a/Content/LinacLab/MyMyUserWidget.uasset b/Content/LinacLab/MyMyUserWidget.uasset index 453324b..d500bac 100644 --- a/Content/LinacLab/MyMyUserWidget.uasset +++ b/Content/LinacLab/MyMyUserWidget.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9f16ddc1967573fd574e58cd940df5b2aba5f593f19e7f62980a1f986b6eea87 -size 96905 +oid sha256:11e8514b18320c3d2e6322ab8b495a14b54a7ffd72d4eda797735de5348f750a +size 121786 diff --git a/Source/MyProject/Private/MagicFloatInput.cpp b/Source/MyProject/Private/MagicFloatInput.cpp index 37bbc44..d09a782 100644 --- a/Source/MyProject/Private/MagicFloatInput.cpp +++ b/Source/MyProject/Private/MagicFloatInput.cpp @@ -6,12 +6,13 @@ void UMagicFloatInput::HandleOnTextCommitted( FText const & inText, ETextCommit::Type inCommitMethod ) { + double x = 0.0; if (inText.IsEmptyOrWhitespace()) { if (sourceInput != nullptr) { - SetText(sourceInput->GetText()); - } else { - auto x = FCString::Atof(*inText.ToString()); - SetText(FText::FromString(FString::Printf(TEXT("%.7f"), x))); + x = FCString::Atod(*sourceInput->GetText().ToString()); } - } -} \ No newline at end of file + } else + x = FCString::Atod(*inText.ToString()); + + SetText(FText::FromString(FString::Printf(TEXT("%.7f"), x))); +} diff --git a/Source/MyProject/Private/MyUserWidget.cpp b/Source/MyProject/Private/MyUserWidget.cpp index 8bf394d..6d85d4e 100644 --- a/Source/MyProject/Private/MyUserWidget.cpp +++ b/Source/MyProject/Private/MyUserWidget.cpp @@ -8,4 +8,19 @@ void UMyUserWidget::NativeOnInitialized() { if (ps == nullptr) return; opIdTextBlock->SetText(FText::FromString(ps->GetPlayerName())); + UTextBlock * arcaneNumbers[9] = { + URM_TextBlock, + MU_TextBlock, + Time_TextBlock, + GR_TextBlock, + CR_TextBlock, + ColX_TextBlock, + ColY_TextBlock, + WR_TextBlock, + AN_TextBlock + }; + for (auto * n : arcaneNumbers) { + auto x = FCString::Atod(*n->GetText().ToString()); + n->SetText(FText::FromString(FString::Printf(TEXT("%.7f"), x))); + } } diff --git a/Source/MyProject/Private/VerifierTextBlock.cpp b/Source/MyProject/Private/VerifierTextBlock.cpp new file mode 100644 index 0000000..e07918a --- /dev/null +++ b/Source/MyProject/Private/VerifierTextBlock.cpp @@ -0,0 +1,5 @@ +// Fill out your copyright notice in the Description page of Project Settings. + + +#include "VerifierTextBlock.h" + diff --git a/Source/MyProject/Public/MagicFloatInput.h b/Source/MyProject/Public/MagicFloatInput.h index c65fe96..76495c0 100644 --- a/Source/MyProject/Public/MagicFloatInput.h +++ b/Source/MyProject/Public/MagicFloatInput.h @@ -4,6 +4,7 @@ #include "Components/EditableTextBox.h" #include "CoreMinimal.h" +#include #include "MagicFloatInput.generated.h" /** @@ -20,5 +21,5 @@ class MYPROJECT_API UMagicFloatInput : public UEditableTextBox { ) override; UPROPERTY(EditAnywhere) - UEditableTextBox * sourceInput; + UTextBlock * sourceInput; }; diff --git a/Source/MyProject/Public/MyUserWidget.h b/Source/MyProject/Public/MyUserWidget.h index 21431e9..fe7881e 100644 --- a/Source/MyProject/Public/MyUserWidget.h +++ b/Source/MyProject/Public/MyUserWidget.h @@ -18,5 +18,32 @@ class MYPROJECT_API UMyUserWidget : public UUserWidget { UPROPERTY(meta = (BindWidget)) UTextBlock * opIdTextBlock; - void NativeOnInitialized() override; + UPROPERTY(meta = (BindWidget)) + UTextBlock * URM_TextBlock; + + UPROPERTY(meta = (BindWidget)) + UTextBlock * MU_TextBlock; + + UPROPERTY(meta = (BindWidget)) + UTextBlock * Time_TextBlock; + + UPROPERTY(meta = (BindWidget)) + UTextBlock * GR_TextBlock; + + UPROPERTY(meta = (BindWidget)) + UTextBlock * CR_TextBlock; + + UPROPERTY(meta = (BindWidget)) + UTextBlock * ColX_TextBlock; + + UPROPERTY(meta = (BindWidget)) + UTextBlock * ColY_TextBlock; + + UPROPERTY(meta = (BindWidget)) + UTextBlock * WR_TextBlock; + + UPROPERTY(meta = (BindWidget)) + UTextBlock * AN_TextBlock; + + void NativeOnInitialized() override; }; diff --git a/Source/MyProject/Public/VerifierTextBlock.h b/Source/MyProject/Public/VerifierTextBlock.h new file mode 100644 index 0000000..2bc9569 --- /dev/null +++ b/Source/MyProject/Public/VerifierTextBlock.h @@ -0,0 +1,17 @@ +// Fill out your copyright notice in the Description page of Project Settings. + +#pragma once + +#include "CoreMinimal.h" +#include "Components/TextBlock.h" +#include "VerifierTextBlock.generated.h" + +/** + * + */ +UCLASS() +class MYPROJECT_API UVerifierTextBlock : public UTextBlock +{ + GENERATED_BODY() + +};