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

PaintBrush: Let's have Layer::rect() and Layer::relative_rect()

Browse source 
These two have the same semantics as GUI::Widget. The rect() is always
at location { 0, 0 }, while the relative_rect()'s location is relative
to the "parent", which in this case is the Layer's Image.
This commit is contained in:
Andreas Kling 2020-05-12 23:49:52 +02:00
parent 83d24dcb1d
commit 9566f6c8b3
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Applications/PaintBrush/ImageEditor.cpp
View file

@ -58,14 +58,13 @@ void ImageEditor::paint_event(GUI::PaintEvent& event)
} }
if (m_active_layer) { if (m_active_layer) {
painter.draw_rect(m_active_layer->rect().inflated(2, 2), Color::Black); painter.draw_rect(m_active_layer->relative_rect().inflated(2, 2), Color::Black);
} }
} }
static GUI::MouseEvent event_adjusted_for_layer(const GUI::MouseEvent& original_event, const Layer& layer) static GUI::MouseEvent event_adjusted_for_layer(const GUI::MouseEvent& original_event, const Layer& layer)
{ {
auto position_in_active_layer_coordinates = original_event.position().translated(-layer.location()); auto position_in_active_layer_coordinates = original_event.position().translated(-layer.location());
dbg() << "adjusted: " << position_in_active_layer_coordinates;
return { return {
static_cast<GUI::Event::Type>(original_event.type()), static_cast<GUI::Event::Type>(original_event.type()),
position_in_active_layer_coordinates, original_event.buttons(), position_in_active_layer_coordinates, original_event.buttons(),

3
Applications/PaintBrush/Layer.h
View file

@ -49,7 +49,8 @@ public:
Gfx::Bitmap& bitmap() { return *m_bitmap; } Gfx::Bitmap& bitmap() { return *m_bitmap; }
Gfx::Size size() const { return bitmap().size(); } Gfx::Size size() const { return bitmap().size(); }
Gfx::Rect rect() const { return { location(), size() }; } Gfx::Rect relative_rect() const { return { location(), size() }; }
Gfx::Rect rect() const { return { {}, size() }; }
const String& name() const { return m_name; } const String& name() const { return m_name; }
void set_name(const String& name) { m_name = name; } void set_name(const String& name) { m_name = name; }