From 6d79d932f955707138e920e7af98bfe3dbe0e2b4 Mon Sep 17 00:00:00 2001 From: FrHun <28605587+frhun@users.noreply.github.com> Date: Fri, 10 Feb 2023 01:08:13 +0100 Subject: [PATCH] LibGUI: Implement calculated sizes for Slider --- Userland/Libraries/LibGUI/Slider.cpp | 16 ++++++++++++++++ Userland/Libraries/LibGUI/Slider.h | 3 +++ 2 files changed, 19 insertions(+) diff --git a/Userland/Libraries/LibGUI/Slider.cpp b/Userland/Libraries/LibGUI/Slider.cpp index 8c22b48b12..350225cfa8 100644 --- a/Userland/Libraries/LibGUI/Slider.cpp +++ b/Userland/Libraries/LibGUI/Slider.cpp @@ -24,6 +24,8 @@ Slider::Slider(Orientation orientation) { KnobSizeMode::Fixed, "Fixed" }, { KnobSizeMode::Proportional, "Proportional" }); REGISTER_BOOL_PROPERTY("jump_to_cursor", jump_to_cursor, set_jump_to_cursor); + + set_preferred_size(SpecialDimension::Fit); } void Slider::paint_event(PaintEvent& event) @@ -199,4 +201,18 @@ void Slider::set_knob_hovered(bool hovered) update(knob_rect()); } +Optional Slider::calculated_min_size() const +{ + if (orientation() == Gfx::Orientation::Vertical) + return { { knob_secondary_size(), knob_fixed_primary_size() * 2 + track_margin() * 2 } }; + return { { knob_fixed_primary_size() * 2 + track_margin() * 2, knob_secondary_size() } }; +} + +Optional Slider::calculated_preferred_size() const +{ + if (orientation() == Gfx::Orientation::Vertical) + return { { SpecialDimension::Shrink, SpecialDimension::OpportunisticGrow } }; + return { { SpecialDimension::OpportunisticGrow, SpecialDimension::Shrink } }; +} + } diff --git a/Userland/Libraries/LibGUI/Slider.h b/Userland/Libraries/LibGUI/Slider.h index a2f3cfd800..4b7bf837dd 100644 --- a/Userland/Libraries/LibGUI/Slider.h +++ b/Userland/Libraries/LibGUI/Slider.h @@ -46,6 +46,9 @@ public: protected: explicit Slider(Orientation = Orientation::Vertical); + virtual Optional calculated_min_size() const override; + virtual Optional calculated_preferred_size() const override; + virtual void paint_event(PaintEvent&) override; void start_drag(Gfx::IntPoint); virtual void mousedown_event(MouseEvent&) override;