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

Taskbar+LibGUI+WindowServer: Shrink taskbar by one pixel

Browse source 
Make the taskbar 27 pixels tall instead of 28. This makes the button
icons and applets vertically centered.

On a related note, this required touching *way* too many places..
This commit is contained in:
Andreas Kling 2021-05-09 00:07:44 +02:00
parent fbe6c275c9
commit 9d8aa2a57a
5 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Libraries/LibGUI/Desktop.h
View file

@ -27,7 +27,7 @@ public:
Gfx::IntRect rect() const { return m_rect; } Gfx::IntRect rect() const { return m_rect; }
int taskbar_height() const { return 28; } int taskbar_height() const { return 27; }
void did_receive_screen_rect(Badge<WindowServerConnection>, const Gfx::IntRect&); void did_receive_screen_rect(Badge<WindowServerConnection>, const Gfx::IntRect&);

4
Userland/Services/Taskbar/ClockWidget.cpp
View file

@ -23,7 +23,7 @@ ClockWidget::ClockWidget()
m_time_width = font().width("22:22:22"); m_time_width = font().width("22:22:22");
set_fixed_size(m_time_width + 20, 22); set_fixed_size(m_time_width + 20, 21);
m_timer = add<Core::Timer>(1000, [this] { m_timer = add<Core::Timer>(1000, [this] {
static time_t last_update_time; static time_t last_update_time;
@ -179,7 +179,7 @@ void ClockWidget::paint_event(GUI::PaintEvent& event)
auto time_text = Core::DateTime::now().to_string("%T"); auto time_text = Core::DateTime::now().to_string("%T");
GUI::Painter painter(*this); GUI::Painter painter(*this);
painter.add_clip_rect(frame_inner_rect()); painter.add_clip_rect(frame_inner_rect());
painter.draw_text(event.rect(), time_text, Gfx::FontDatabase::default_font(), Gfx::TextAlignment::Center, palette().window_text()); painter.draw_text(frame_inner_rect().translated(0, 1), time_text, Gfx::FontDatabase::default_font(), Gfx::TextAlignment::Center, palette().window_text());
} }
void ClockWidget::mousedown_event(GUI::MouseEvent& event) void ClockWidget::mousedown_event(GUI::MouseEvent& event)

8
Userland/Services/Taskbar/TaskbarWindow.cpp
View file

@ -67,7 +67,7 @@ TaskbarWindow::TaskbarWindow(NonnullRefPtr<GUI::Menu> start_menu)
m_start_button = GUI::Button::construct("Serenity"); m_start_button = GUI::Button::construct("Serenity");
m_start_button->set_font(Gfx::FontDatabase::default_bold_font()); m_start_button->set_font(Gfx::FontDatabase::default_bold_font());
m_start_button->set_icon_spacing(0); m_start_button->set_icon_spacing(0);
m_start_button->set_fixed_size(80, 22); m_start_button->set_fixed_size(80, 21);
auto app_icon = GUI::Icon::default_icon("ladyball"); auto app_icon = GUI::Icon::default_icon("ladyball");
m_start_button->set_icon(app_icon.bitmap_for_size(16)); m_start_button->set_icon(app_icon.bitmap_for_size(16));
m_start_button->set_menu(m_start_menu); m_start_button->set_menu(m_start_menu);
@ -170,8 +170,8 @@ void TaskbarWindow::update_applet_area()
NonnullRefPtr<GUI::Button> TaskbarWindow::create_button(const WindowIdentifier& identifier) NonnullRefPtr<GUI::Button> TaskbarWindow::create_button(const WindowIdentifier& identifier)
{ {
auto& button = m_task_button_container->add<TaskbarButton>(identifier); auto& button = m_task_button_container->add<TaskbarButton>(identifier);
button.set_min_size(20, 22); button.set_min_size(20, 21);
button.set_max_size(140, 22); button.set_max_size(140, 21);
button.set_text_alignment(Gfx::TextAlignment::CenterLeft); button.set_text_alignment(Gfx::TextAlignment::CenterLeft);
button.set_icon(*m_default_icon); button.set_icon(*m_default_icon);
return button; return button;
@ -315,7 +315,7 @@ void TaskbarWindow::wm_event(GUI::WMEvent& event)
case GUI::Event::WM_AppletAreaSizeChanged: { case GUI::Event::WM_AppletAreaSizeChanged: {
auto& changed_event = static_cast<GUI::WMAppletAreaSizeChangedEvent&>(event); auto& changed_event = static_cast<GUI::WMAppletAreaSizeChangedEvent&>(event);
m_applet_area_size = changed_event.size(); m_applet_area_size = changed_event.size();
m_applet_area_container->set_fixed_size(changed_event.size().width() + 8, 22); m_applet_area_container->set_fixed_size(changed_event.size().width() + 8, 21);
update_applet_area(); update_applet_area();
break; break;
} }

2
Userland/Services/Taskbar/TaskbarWindow.h
View file

@ -16,7 +16,7 @@ class TaskbarWindow final : public GUI::Window {
public: public:
virtual ~TaskbarWindow() override; virtual ~TaskbarWindow() override;
static int taskbar_height() { return 28; } static int taskbar_height() { return 27; }
private: private:
explicit TaskbarWindow(NonnullRefPtr<GUI::Menu> start_menu); explicit TaskbarWindow(NonnullRefPtr<GUI::Menu> start_menu);

2
Userland/Services/WindowServer/AppletManager.cpp
View file

@ -101,7 +101,7 @@ void AppletManager::add_applet(Window& applet)
void AppletManager::relayout() void AppletManager::relayout()
{ {
constexpr int applet_spacing = 4; constexpr int applet_spacing = 4;
constexpr int applet_window_height = 20; constexpr int applet_window_height = 19;
int total_width = 0; int total_width = 0;
for (auto& existing_applet : m_applets) { for (auto& existing_applet : m_applets) {
total_width += max(0, existing_applet->size().width()) + applet_spacing; total_width += max(0, existing_applet->size().width()) + applet_spacing;