From f8475e50b148c8ff8501663b5cc3405b39a329eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Wed, 30 Apr 2025 13:54:34 +0200 Subject: [PATCH] Add a slider test to the internals tab in system info. It's not quite working right... --- Common/UI/PopupScreens.cpp | 2 +- Common/UI/View.h | 5 +---- UI/DevScreens.cpp | 3 +++ UI/DevScreens.h | 2 ++ 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Common/UI/PopupScreens.cpp b/Common/UI/PopupScreens.cpp index 753ffa82ad..699082cc72 100644 --- a/Common/UI/PopupScreens.cpp +++ b/Common/UI/PopupScreens.cpp @@ -368,7 +368,7 @@ void SliderPopupScreen::CreatePopupContents(UI::ViewGroup *parent) { sliderValue_ = 0; LinearLayout *vert = parent->Add(new LinearLayout(ORIENT_VERTICAL, new LinearLayoutParams(UI::Margins(10, 10)))); - slider_ = new Slider(&sliderValue_, minValue_, maxValue_, new LinearLayoutParams(UI::Margins(10, 10))); + slider_ = new Slider(&sliderValue_, minValue_, maxValue_, 1, new LinearLayoutParams(UI::Margins(10, 10))); slider_->OnChange.Handle(this, &SliderPopupScreen::OnSliderChange); slider_->RestrictChoices(fixedChoices_, numFixedChoices_); vert->Add(slider_); diff --git a/Common/UI/View.h b/Common/UI/View.h index fd1b78ebfa..a63fd34e60 100644 --- a/Common/UI/View.h +++ b/Common/UI/View.h @@ -610,10 +610,7 @@ private: class Slider : public Clickable { public: - Slider(int *value, int minValue, int maxValue, LayoutParams *layoutParams = 0) - : Clickable(layoutParams), value_(value), showPercent_(false), minValue_(minValue), maxValue_(maxValue), paddingLeft_(5), paddingRight_(70), step_(1), repeat_(-1) {} - - Slider(int *value, int minValue, int maxValue, int step = 1, LayoutParams *layoutParams = 0) + Slider(int *value, int minValue, int maxValue, int step = 1, LayoutParams *layoutParams = nullptr) : Clickable(layoutParams), value_(value), showPercent_(false), minValue_(minValue), maxValue_(maxValue), paddingLeft_(5), paddingRight_(70), repeat_(-1) { step_ = step <= 0 ? 1 : step; } diff --git a/UI/DevScreens.cpp b/UI/DevScreens.cpp index 87a599c490..5b30e52333 100644 --- a/UI/DevScreens.cpp +++ b/UI/DevScreens.cpp @@ -948,6 +948,9 @@ void SystemInfoScreen::CreateInternalsTab(UI::ViewGroup *internals) { internals->Add(new InfoItem(si->T("Texture count"), StringFromFormat("%d", text->GetStringCacheSize()))); internals->Add(new InfoItem(si->T("Data size"), NiceSizeFormat(text->GetCacheDataSize()))); + internals->Add(new ItemHeader(si->T("Slider test"))); + internals->Add(new Slider(&testSliderValue_, 0, 100, 1, new LinearLayoutParams(FILL_PARENT, WRAP_CONTENT))); + internals->Add(new ItemHeader(si->T("Notification tests"))); internals->Add(new Choice(si->T("Error")))->OnClick.Add([&](UI::EventParams &) { std::string str = "Error " + CodepointToUTF8(0x1F41B) + CodepointToUTF8(0x1F41C) + CodepointToUTF8(0x1F914); diff --git a/UI/DevScreens.h b/UI/DevScreens.h index 2c5136b19b..a8763c3f01 100644 --- a/UI/DevScreens.h +++ b/UI/DevScreens.h @@ -121,6 +121,8 @@ private: void CreateInternalsTab(UI::ViewGroup *internals); void CreateOpenGLExtsTab(UI::LinearLayout *gpuExtensions); void CreateVulkanExtsTab(UI::LinearLayout *gpuExtensions); + + int testSliderValue_ = 0; }; class GPIGPOScreen : public PopupScreen {