mirrors/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity.git synced 2025-01-23 18:02:05 -05:00
Code Issues Projects Releases Packages Wiki Activity

GLabel: Paint the text with a disabled look when appropriate.

Browse source 
Also turn on right-side text elision in all cases by default.
This commit is contained in:
Andreas Kling 2019-05-24 23:00:07 +02:00
parent b0ccd04a9c
commit ac7e02d984
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
LibGUI/GLabel.cpp
View file

@ -45,14 +45,20 @@ void GLabel::paint_event(GPaintEvent& event)
painter.blit(icon_location, *m_icon, m_icon->rect()); painter.blit(icon_location, *m_icon, m_icon->rect());
} }
} }
if (!text().is_empty()) { if (text().is_empty())
int indent = 0; return;
if (frame_thickness() > 0) int indent = 0;
indent = font().glyph_width('x') / 2; if (frame_thickness() > 0)
auto text_rect = frame_inner_rect(); indent = font().glyph_width('x') / 2;
text_rect.move_by(indent, 0); auto text_rect = frame_inner_rect();
text_rect.set_width(text_rect.width() - indent * 2); text_rect.move_by(indent, 0);
painter.draw_text(text_rect, text(), m_text_alignment, foreground_color()); text_rect.set_width(text_rect.width() - indent * 2);
if (is_enabled()) {
painter.draw_text(text_rect, text(), m_text_alignment, foreground_color(), TextElision::Right);
} else {
painter.draw_text(text_rect.translated(1, 1), text(), font(), text_alignment(), Color::White, TextElision::Right);
painter.draw_text(text_rect, text(), font(), text_alignment(), Color::from_rgb(0x808080), TextElision::Right);
} }
} }