From ce4ee1df1b3e3ecc16607a31318e89bf02bb943f Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Tue, 27 Oct 2020 20:45:38 +0100 Subject: [PATCH] WindowServer: Improve look of drag&drop items somewhat This just adds a bit of padding around items. There's lots of room for improvement here. --- Services/WindowServer/Compositor.cpp | 5 +++-- Services/WindowServer/WindowManager.cpp | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Services/WindowServer/Compositor.cpp b/Services/WindowServer/Compositor.cpp index 4953c1bf78..7c023409da 100644 --- a/Services/WindowServer/Compositor.cpp +++ b/Services/WindowServer/Compositor.cpp @@ -461,14 +461,15 @@ void Compositor::compose() // TODO: render once into a backing bitmap, then just blit... auto render_dnd = [&]() { back_painter.fill_rect(dnd_rect, wm.palette().selection().with_alpha(200)); + back_painter.draw_rect(dnd_rect, wm.palette().selection()); if (!wm.dnd_text().is_empty()) { auto text_rect = dnd_rect; if (wm.dnd_bitmap()) - text_rect.move_by(wm.dnd_bitmap()->width(), 0); + text_rect.move_by(wm.dnd_bitmap()->width() + 8, 0); back_painter.draw_text(text_rect, wm.dnd_text(), Gfx::TextAlignment::CenterLeft, wm.palette().selection_text()); } if (wm.dnd_bitmap()) { - back_painter.blit(dnd_rect.top_left(), *wm.dnd_bitmap(), wm.dnd_bitmap()->rect()); + back_painter.blit(dnd_rect.top_left().translated(4, 4), *wm.dnd_bitmap(), wm.dnd_bitmap()->rect()); } }; diff --git a/Services/WindowServer/WindowManager.cpp b/Services/WindowServer/WindowManager.cpp index 6164329406..a53a38480d 100644 --- a/Services/WindowServer/WindowManager.cpp +++ b/Services/WindowServer/WindowManager.cpp @@ -1381,7 +1381,7 @@ Gfx::IntRect WindowManager::dnd_rect() const int width = font().width(m_dnd_text) + bitmap_width; int height = max((int)font().glyph_height(), bitmap_height); auto location = Compositor::the().current_cursor_rect().center().translated(8, 8); - return Gfx::IntRect(location, { width, height }).inflated(4, 4); + return Gfx::IntRect(location, { width, height }).inflated(16, 8); } bool WindowManager::update_theme(String theme_path, String theme_name)