mirrors/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity.git synced 2025-01-24 02:12:09 -05:00
Code Issues Projects Releases Packages Wiki Activity

PixelPaint: Let Layer track whether it's selected or not

Browse source 
This will simplify a lot of code that keeps getting more confusing.
This commit is contained in:
Andreas Kling 2020-05-26 10:12:47 +02:00
parent 18d68c8c94
commit b5788594f9
3 changed files with 16 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Applications/PixelPaint/Layer.h
View file

@ -59,12 +59,17 @@ public:
void did_modify_bitmap(Image&);
void set_selected(bool selected) { m_selected = selected; }
bool is_selected() const { return m_selected; }
private:
explicit Layer(const Gfx::Size&, const String& name);
String m_name;
Gfx::Point m_location;
RefPtr<Gfx::Bitmap> m_bitmap;
bool m_selected { false };
};
}

30
Applications/PixelPaint/LayerListWidget.cpp
View file

@ -61,7 +61,7 @@ void LayerListWidget::rebuild_gadgets()
m_gadgets.clear();
if (m_image) {
for (size_t layer_index = 0; layer_index < m_image->layer_count(); ++layer_index) {
m_gadgets.append({ layer_index, {}, {}, false, false, {} });
m_gadgets.append({ layer_index, {}, {}, false, {} });
}
}
relayout_gadgets();
@ -95,8 +95,8 @@ void LayerListWidget::paint_event(GUI::PaintEvent& event)
}
if (gadget.is_moving) {
painter.fill_rect(adjusted_rect, palette().threed_shadow1());
} else if (gadget.is_selected) {
painter.fill_rect(adjusted_rect, palette().selection().lightened(1.5f));
} else if (layer.is_selected()) {
painter.fill_rect(adjusted_rect, palette().selection());
}
@ -109,7 +109,7 @@ void LayerListWidget::paint_event(GUI::PaintEvent& event)
Gfx::Rect text_rect { thumbnail_rect.right() + 10, adjusted_rect.y(), adjusted_rect.width(), adjusted_rect.height() };
text_rect.intersect(adjusted_rect);
painter.draw_text(text_rect, layer.name(), Gfx::TextAlignment::CenterLeft, gadget.is_selected ? palette().selection_text() : palette().button_text());
painter.draw_text(text_rect, layer.name(), Gfx::TextAlignment::CenterLeft, layer.is_selected() ? palette().selection_text() : palette().button_text());
};
for (auto& gadget : m_gadgets) {
@ -145,8 +145,8 @@ void LayerListWidget::mousedown_event(GUI::MouseEvent& event)
m_moving_gadget_index = gadget_index;
m_moving_event_origin = event.position();
auto& gadget = m_gadgets[m_moving_gadget_index.value()];
if (on_layer_select)
on_layer_select(&m_image->layer(gadget_index.value()));
auto& layer = m_image->layer(gadget_index.value());
set_selected_layer(&layer);
gadget.is_moving = true;
gadget.movement_delta = {};
update();
@ -190,7 +190,7 @@ void LayerListWidget::image_did_add_layer(size_t layer_index)
m_gadgets[m_moving_gadget_index.value()].is_moving = false;
m_moving_gadget_index = {};
}
Gadget gadget { layer_index, {}, {}, false, false, {} };
Gadget gadget { layer_index, {}, {}, false, {} };
m_gadgets.insert(layer_index, move(gadget));
relayout_gadgets();
}
@ -275,18 +275,10 @@ void LayerListWidget::set_selected_layer(Layer* layer)
{
if (!m_image)
return;
if (!layer) {
for (auto& gadget : m_gadgets)
gadget.is_selected = false;
} else {
auto layer_index = m_image->index_of(*layer);
for (auto& gadget : m_gadgets) {
if (gadget.layer_index == layer_index)
gadget.is_selected = true;
else
gadget.is_selected = false;
}
}
for (size_t i = 0; i < m_image->layer_count(); ++i)
m_image->layer(i).set_selected(layer == &m_image->layer(i));
if (on_layer_select)
on_layer_select(layer);
update();
}

1
Applications/PixelPaint/LayerListWidget.h
View file

@ -72,7 +72,6 @@ private:
Gfx::Rect rect;
Gfx::Rect temporary_rect_during_move;
bool is_moving { false };
bool is_selected { false };
Gfx::Point movement_delta;
};