1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-31 11:18:11 +00:00

LibGUI+LibGfx: Collapse the '&' from Alt shortcuts in tooltip texts

Also resolve a FIXME about using GUI::Label auto-sizing since we're
changing this code and it simplifies what we're doing.

Fixes #6219.
This commit is contained in:
Andreas Kling 2021-04-11 01:09:44 +02:00
parent f27352dfdc
commit a4992b5ece
3 changed files with 27 additions and 25 deletions

View file

@ -44,12 +44,10 @@ class Application::TooltipWindow final : public Window {
C_OBJECT(TooltipWindow);
public:
void set_tooltip(String tooltip)
void set_tooltip(const String& tooltip)
{
// FIXME: Add some kind of GUI::Label auto-sizing feature.
int text_width = m_label->font().width(tooltip);
set_rect(rect().x(), rect().y(), text_width + 10, m_label->font().glyph_height() + 8);
m_label->set_text(move(tooltip));
m_label->set_text(Gfx::parse_ampersand_string(tooltip));
set_rect(rect().x(), rect().y(), m_label->min_width() + 10, m_label->font().glyph_height() + 8);
}
private:
@ -63,6 +61,7 @@ private:
m_label->set_frame_thickness(1);
m_label->set_frame_shape(Gfx::FrameShape::Container);
m_label->set_frame_shadow(Gfx::FrameShadow::Plain);
m_label->set_autosize(true);
}
RefPtr<Label> m_label;