From cab2ee5ea259d77ec8199fa4638348d4af99bd95 Mon Sep 17 00:00:00 2001 From: Eugene Barnett Date: Sat, 5 Jun 2021 21:36:30 -0400 Subject: [PATCH] Magnifier: Add desktop display scale awareness Continues to magnify correctly at the most current desktop scale. --- Userland/Applications/Magnifier/MagnifierWidget.cpp | 3 ++- Userland/Applications/Magnifier/MagnifierWidget.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Userland/Applications/Magnifier/MagnifierWidget.cpp b/Userland/Applications/Magnifier/MagnifierWidget.cpp index 84ef35d0ce..8f6834f04c 100644 --- a/Userland/Applications/Magnifier/MagnifierWidget.cpp +++ b/Userland/Applications/Magnifier/MagnifierWidget.cpp @@ -38,6 +38,7 @@ void MagnifierWidget::set_scale_factor(int scale_factor) void MagnifierWidget::timer_event(Core::TimerEvent&) { m_mouse_position = GUI::WindowServerConnection::the().get_global_cursor_position(); + m_desktop_display_scale = GUI::WindowServerConnection::the().get_desktop_display_scale(); update(); } @@ -47,7 +48,7 @@ void MagnifierWidget::paint_event(GUI::PaintEvent&) // Grab and paint our screenshot. Gfx::IntSize region_size { size().width() / m_scale_factor, size().height() / m_scale_factor }; - Gfx::Rect region { m_mouse_position.x() - (region_size.width() / 2), m_mouse_position.y() - (region_size.height() / 2), region_size.width(), region_size.height() }; + Gfx::Rect region { (m_mouse_position.x() * m_desktop_display_scale) - (region_size.width() / 2), (m_mouse_position.y() * m_desktop_display_scale) - (region_size.height() / 2), region_size.width(), region_size.height() }; auto map = GUI::WindowServerConnection::the().get_screen_bitmap(region); painter.draw_scaled_bitmap(rect(), *map.bitmap(), map.bitmap()->rect()); } diff --git a/Userland/Applications/Magnifier/MagnifierWidget.h b/Userland/Applications/Magnifier/MagnifierWidget.h index f58d7d54d5..2fea077fd1 100644 --- a/Userland/Applications/Magnifier/MagnifierWidget.h +++ b/Userland/Applications/Magnifier/MagnifierWidget.h @@ -24,4 +24,5 @@ private: Gfx::IntPoint m_mouse_position; int m_scale_factor { 2 }; + int m_desktop_display_scale { 1 }; };