lainns-mirror/noctalia-shell
1
0
Fork 0
mirror of https://github.com/noctalia-dev/noctalia-shell.git synced 2026-05-11 17:08:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

stepper: less obnoxious, removed bolded and smarter sizing

Browse Source
This commit is contained in:
Lemmy
2026-05-06 08:40:11 -04:00
parent 189970db43
commit f086886fa4
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shell/test/test_panel.cpp
+1 -1
View File
@@ -441,7 +441,7 @@ void TestPanel::create() {
{
auto stepper = std::make_unique<Stepper>();
stepper->setScale(scale);
stepper->setRange(0, 99);
stepper->setRange(0, 999);
stepper->setStep(1);
stepper->setValue(42);
stepper->setOnValueChanged([this](int v) {
src/ui/controls/stepper.cpp
+13 -8
View File
@@ -19,7 +19,12 @@
namespace {
constexpr float kDefaultMinWidth = 140.0f;
constexpr float kDefaultMinWidth = 100.0f;
// Matches Input's internal text viewport inset so the layout minimum reserves
// the visible text box, not just ink.
constexpr float kInputTextInnerInset = 3.0f;
float valueInputHorizontalPadding(float scale) { return Style::spaceSm * scale; }
std::unique_ptr<Separator> makeStepperSeparator(float scale) {
auto sep = std::make_unique<Separator>();
@@ -96,11 +101,10 @@ Stepper::Stepper() {
auto field = std::make_unique<Input>();
field->setFrameVisible(false);
field->setBold(true);
field->setTextAlign(TextAlign::Center);
field->setFontSize(Style::fontSizeBody);
field->setControlHeight(Style::controlHeight);
field->setHorizontalPadding(Style::spaceMd);
field->setHorizontalPadding(valueInputHorizontalPadding(m_scale));
field->setFlexGrow(1.0f);
field->setOnSubmit([this](const std::string& /*text*/) { commitValueField(); });
field->setOnFocusLoss([this]() { commitValueField(); });
@@ -137,6 +141,7 @@ void Stepper::setRange(int minValue, int maxValue) {
m_min = minValue;
m_max = maxValue;
setValue(m_value);
markLayoutDirty();
}
void Stepper::setStep(int step) {
@@ -191,7 +196,7 @@ void Stepper::setScale(float scale) {
if (m_valueInput != nullptr) {
m_valueInput->setFontSize(Style::fontSizeBody * m_scale);
m_valueInput->setControlHeight(Style::controlHeight * m_scale);
m_valueInput->setHorizontalPadding(Style::spaceMd * m_scale);
m_valueInput->setHorizontalPadding(valueInputHorizontalPadding(m_scale));
}
if (m_decrement != nullptr) {
m_decrement->setGlyphSize(Style::fontSizeBody * m_scale);
@@ -212,10 +217,10 @@ void Stepper::syncValueFieldMinWidth(Renderer& renderer) {
return;
}
const float fs = Style::fontSizeBody * m_scale;
const float wMin = renderer.measureText(std::to_string(m_min), fs, true).width;
const float wMax = renderer.measureText(std::to_string(m_max), fs, true).width;
const float digitFloor = fs * 2.5f;
m_valueInput->setMinLayoutWidth(std::max({wMin, wMax, digitFloor}));
const float wMin = renderer.measureText(std::to_string(m_min), fs, false).width;
const float wMax = renderer.measureText(std::to_string(m_max), fs, false).width;
const float textInset = valueInputHorizontalPadding(m_scale) + kInputTextInnerInset;
m_valueInput->setMinLayoutWidth(std::max(wMin, wMax) + textInset * 2.0f);
}
LayoutSize Stepper::doMeasure(Renderer& renderer, const LayoutConstraints& constraints) {