RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 04:27:44 +00:00
Code Issues Activity Actions

LibGUI: Make Button height adapt to the current font size

Browse source
This commit is contained in:
Andreas Kling 2023-03-04 00:12:19 +01:00
parent 5979ce8316
commit bb4b747424
1 changed files with 13 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Userland/Libraries/LibGUI/Button.cpp
View file

@ -23,8 +23,8 @@ namespace GUI {
Button::Button(String text) Button::Button(String text)
: AbstractButton(move(text)) : AbstractButton(move(text))
{ {
set_min_size({ 40, 22 }); set_min_size({ 40, SpecialDimension::Shrink });
set_preferred_size({ SpecialDimension::OpportunisticGrow, 22 }); set_preferred_size({ SpecialDimension::OpportunisticGrow, SpecialDimension::Shrink });
set_focus_policy(GUI::FocusPolicy::StrongFocus); set_focus_policy(GUI::FocusPolicy::StrongFocus);
on_focus_change = [this](bool has_focus, auto) { on_focus_change = [this](bool has_focus, auto) {
@ -275,24 +275,26 @@ void Button::timer_event(Core::TimerEvent&)
Optional<UISize> Button::calculated_min_size() const Optional<UISize> Button::calculated_min_size() const
{ {
int horizontal = 0, vertical = 0; int width = 0;
int height = 0;
if (!text().is_empty()) { if (!text().is_empty()) {
auto& font = this->font(); auto& font = this->font();
horizontal = static_cast<int>(ceilf(font.width(text()))) + 2; width = static_cast<int>(ceilf(font.width(text()))) + 2;
vertical = font.pixel_size_rounded_up() + 4; // FIXME: Use actual maximum total height height = font.pixel_size_rounded_up() + 4; // FIXME: Use actual maximum total height
} }
if (m_icon) { if (m_icon) {
vertical = max(vertical, m_icon->height()); height += max(height, m_icon->height());
width += m_icon->width() + icon_spacing();
horizontal += m_icon->width() + icon_spacing();
} }
horizontal += 8; width += 8;
vertical += 4; height += 4;
return UISize(horizontal, vertical); height = max(22, height);
return UISize(width, height);
} }
} }