diff options
| -rw-r--r-- | Userland/Libraries/LibGUI/Desktop.h | 2 | ||||
| -rw-r--r-- | Userland/Services/Taskbar/ClockWidget.cpp | 4 | ||||
| -rw-r--r-- | Userland/Services/Taskbar/TaskbarWindow.cpp | 8 | ||||
| -rw-r--r-- | Userland/Services/Taskbar/TaskbarWindow.h | 2 | ||||
| -rw-r--r-- | Userland/Services/WindowServer/AppletManager.cpp | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/Userland/Libraries/LibGUI/Desktop.h b/Userland/Libraries/LibGUI/Desktop.h index aee19953aa..f725d9b86e 100644 --- a/Userland/Libraries/LibGUI/Desktop.h +++ b/Userland/Libraries/LibGUI/Desktop.h @@ -27,7 +27,7 @@ public: 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&); diff --git a/Userland/Services/Taskbar/ClockWidget.cpp b/Userland/Services/Taskbar/ClockWidget.cpp index d9a22b1efe..99ee56d5bb 100644 --- a/Userland/Services/Taskbar/ClockWidget.cpp +++ b/Userland/Services/Taskbar/ClockWidget.cpp @@ -23,7 +23,7 @@ ClockWidget::ClockWidget() 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] { 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"); GUI::Painter painter(*this); 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) diff --git a/Userland/Services/Taskbar/TaskbarWindow.cpp b/Userland/Services/Taskbar/TaskbarWindow.cpp index 05aeff2972..01d2835b3e 100644 --- a/Userland/Services/Taskbar/TaskbarWindow.cpp +++ b/Userland/Services/Taskbar/TaskbarWindow.cpp @@ -67,7 +67,7 @@ TaskbarWindow::TaskbarWindow(NonnullRefPtr<GUI::Menu> start_menu) m_start_button = GUI::Button::construct("Serenity"); m_start_button->set_font(Gfx::FontDatabase::default_bold_font()); 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"); m_start_button->set_icon(app_icon.bitmap_for_size(16)); 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) { auto& button = m_task_button_container->add<TaskbarButton>(identifier); - button.set_min_size(20, 22); - button.set_max_size(140, 22); + button.set_min_size(20, 21); + button.set_max_size(140, 21); button.set_text_alignment(Gfx::TextAlignment::CenterLeft); button.set_icon(*m_default_icon); return button; @@ -315,7 +315,7 @@ void TaskbarWindow::wm_event(GUI::WMEvent& event) case GUI::Event::WM_AppletAreaSizeChanged: { auto& changed_event = static_cast<GUI::WMAppletAreaSizeChangedEvent&>(event); 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(); break; } diff --git a/Userland/Services/Taskbar/TaskbarWindow.h b/Userland/Services/Taskbar/TaskbarWindow.h index 68bf660aea..9eaa727595 100644 --- a/Userland/Services/Taskbar/TaskbarWindow.h +++ b/Userland/Services/Taskbar/TaskbarWindow.h @@ -16,7 +16,7 @@ class TaskbarWindow final : public GUI::Window { public: virtual ~TaskbarWindow() override; - static int taskbar_height() { return 28; } + static int taskbar_height() { return 27; } private: explicit TaskbarWindow(NonnullRefPtr<GUI::Menu> start_menu); diff --git a/Userland/Services/WindowServer/AppletManager.cpp b/Userland/Services/WindowServer/AppletManager.cpp index 2885441664..a63c1b4051 100644 --- a/Userland/Services/WindowServer/AppletManager.cpp +++ b/Userland/Services/WindowServer/AppletManager.cpp @@ -101,7 +101,7 @@ void AppletManager::add_applet(Window& applet) void AppletManager::relayout() { constexpr int applet_spacing = 4; - constexpr int applet_window_height = 20; + constexpr int applet_window_height = 19; int total_width = 0; for (auto& existing_applet : m_applets) { total_width += max(0, existing_applet->size().width()) + applet_spacing; |