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

Revert "LibGUI: Use bold font for the currently active TabWidget tab"

Browse source 
This reverts commit 4d8206f7c2.

This was not visually pleasant. We'll have to come up with some better
way to distinguish the active tab in Browser.
This commit is contained in:
Andreas Kling 2020-04-26 17:46:16 +02:00
parent fb826aa59a
commit 37918d4141
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Libraries/LibGUI/TabWidget.cpp
View file

@ -189,7 +189,7 @@ void TabWidget::paint_event(PaintEvent& event)
Gfx::StylePainter::paint_tab_button(painter, button_rect, palette(), true, hovered, m_tabs[i].widget->is_enabled()); Gfx::StylePainter::paint_tab_button(painter, button_rect, palette(), true, hovered, m_tabs[i].widget->is_enabled());
auto text_rect = button_rect.translated(0, 1); auto text_rect = button_rect.translated(0, 1);
paint_tab_icon_if_needed(m_tabs[i].icon, button_rect, text_rect); paint_tab_icon_if_needed(m_tabs[i].icon, button_rect, text_rect);
painter.draw_text(text_rect, m_tabs[i].title, Gfx::Font::default_bold_font(), m_text_alignment, palette().button_text(), Gfx::TextElision::Right); painter.draw_text(text_rect, m_tabs[i].title, m_text_alignment, palette().button_text(), Gfx::TextElision::Right);
painter.draw_line(button_rect.bottom_left().translated(1, 1), button_rect.bottom_right().translated(-1, 1), palette().button()); painter.draw_line(button_rect.bottom_left().translated(1, 1), button_rect.bottom_right().translated(-1, 1), palette().button());
break; break;
} }
@ -204,13 +204,10 @@ Gfx::Rect TabWidget::button_rect(int index) const
{ {
int x_offset = 2; int x_offset = 2;
for (int i = 0; i < index; ++i) { for (int i = 0; i < index; ++i) {
bool is_active_tab = m_tabs[i].widget == active_widget(); auto tab_width = m_uniform_tabs ? uniform_tab_width() : m_tabs[i].width(font());
auto& font = is_active_tab ? Gfx::Font::default_bold_font() : Gfx::Font::default_font();
auto tab_width = m_uniform_tabs ? uniform_tab_width() : m_tabs[i].width(font);
x_offset += tab_width; x_offset += tab_width;
} }
auto& font = m_tabs[index].widget == active_widget() ? Gfx::Font::default_bold_font() : Gfx::Font::default_font(); Gfx::Rect rect { x_offset, 0, m_uniform_tabs ? uniform_tab_width() : m_tabs[index].width(font()), bar_height() };
Gfx::Rect rect { x_offset, 0, m_uniform_tabs ? uniform_tab_width() : m_tabs[index].width(font), bar_height() };
if (m_tabs[index].widget != m_active_widget) { if (m_tabs[index].widget != m_active_widget) {
rect.move_by(0, 2); rect.move_by(0, 2);
rect.set_height(rect.height() - 2); rect.set_height(rect.height() - 2);