RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 00:47:45 +00:00
Code Issues Activity Actions

Magnifier: Prevent 0 size that otherwise hangs

Browse source
This commit is contained in:
FrHun 2022-12-04 22:23:12 +01:00 • committed by Sam Atkins
parent 808eafcf1e
commit 9e0deb76b2
2 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Userland/Applications/Magnifier/MagnifierWidget.cpp
View file

@ -20,7 +20,10 @@ MagnifierWidget::MagnifierWidget()
void MagnifierWidget::set_scale_factor(int scale_factor) void MagnifierWidget::set_scale_factor(int scale_factor)
{ {
VERIFY(scale_factor == 2 || scale_factor == 4 || scale_factor == 8); VERIFY(scale_factor == 2 || scale_factor == 4 || scale_factor == 8);
if (m_scale_factor == scale_factor)
return;
m_scale_factor = scale_factor; m_scale_factor = scale_factor;
layout_relevant_change_occurred();
update(); update();
} }
@ -77,12 +80,14 @@ void MagnifierWidget::sync()
auto size = frame_inner_rect().size(); auto size = frame_inner_rect().size();
Gfx::IntSize grab_size { size.width() / m_scale_factor, size.height() / m_scale_factor }; Gfx::IntSize grab_size { size.width() / m_scale_factor, size.height() / m_scale_factor };
VERIFY(grab_size.width() != 0 && grab_size.height() != 0);
if (m_locked_location.has_value()) { if (m_locked_location.has_value()) {
m_grabbed_bitmap = GUI::ConnectionToWindowServer::the().get_screen_bitmap_around_location(grab_size, m_locked_location.value()).bitmap(); m_grabbed_bitmap = GUI::ConnectionToWindowServer::the().get_screen_bitmap_around_location(grab_size, m_locked_location.value()).bitmap();
} else { } else {
m_grabbed_bitmap = GUI::ConnectionToWindowServer::the().get_screen_bitmap_around_cursor(grab_size).bitmap(); m_grabbed_bitmap = GUI::ConnectionToWindowServer::the().get_screen_bitmap_around_cursor(grab_size).bitmap();
} }
m_grabbed_bitmaps.enqueue(m_grabbed_bitmap); m_grabbed_bitmaps.enqueue(m_grabbed_bitmap);
update(); update();
} }

5
Userland/Applications/Magnifier/MagnifierWidget.h
View file

@ -36,6 +36,11 @@ public:
void display_next_frame(); void display_next_frame();
RefPtr<Gfx::Bitmap> current_bitmap() const { return m_grabbed_bitmap; }; RefPtr<Gfx::Bitmap> current_bitmap() const { return m_grabbed_bitmap; };
virtual Optional<GUI::UISize> calculated_min_size() const override
{
return GUI::UISize { frame_thickness() * 2 + m_scale_factor, frame_thickness() * 2 + m_scale_factor };
}
private: private:
MagnifierWidget(); MagnifierWidget();