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

PixelPaint: Let the move tool optionally select the active layer

Browse source 
Previously, the move tool would always select the topmost layer before
performing a move operation. This commit adds an option for the move
tool to always select the active layer, even if it is behind another.
This commit is contained in:
Tim Ledbetter 2023-01-15 21:22:30 +00:00 • committed by Jelle Raaijmakers
parent 16eca649f1
commit 77e15ff4da
3 changed files with 66 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Userland/Applications/PixelPaint/Tools/MoveTool.h
View file

@ -1,6 +1,6 @@
/*
* Copyright (c) 2020, Andreas Kling <kling@serenityos.org>
* Copyright (c) 2022, the SerenityOS developers.
* Copyright (c) 2022-2023, the SerenityOS developers.
*
* SPDX-License-Identifier: BSD-2-Clause
*/
@ -9,6 +9,7 @@
#include "../Layer.h"
#include "Tool.h"
#include <LibGUI/RadioButton.h>
namespace PixelPaint {
@ -23,19 +24,29 @@ public:
MoveTool() = default;
virtual ~MoveTool() override = default;
enum class LayerSelectionMode {
ForegroundLayer,
ActiveLayer,
};
virtual void on_mousedown(Layer*, MouseEvent&) override;
virtual void on_mousemove(Layer*, MouseEvent&) override;
virtual void on_mouseup(Layer*, MouseEvent&) override;
virtual bool on_keydown(GUI::KeyEvent&) override;
virtual void on_keyup(GUI::KeyEvent&) override;
virtual void on_second_paint(Layer const*, GUI::PaintEvent&) override;
virtual GUI::Widget* get_properties_widget() override;
virtual Variant<Gfx::StandardCursor, NonnullRefPtr<Gfx::Bitmap>> cursor() override;
virtual bool is_overriding_alt() override { return true; }
LayerSelectionMode layer_selection_mode() const { return m_layer_selection_mode; }
private:
virtual StringView tool_name() const override { return "Move Tool"sv; }
ErrorOr<void> update_cached_preview_bitmap(Layer const* layer);
Optional<ResizeAnchorLocation const> resize_anchor_location_from_cursor_position(Layer const*, MouseEvent&);
void toggle_selection_mode();
LayerSelectionMode m_layer_selection_mode { LayerSelectionMode::ForegroundLayer };
RefPtr<Layer> m_layer_being_moved;
Gfx::IntPoint m_event_origin;
Gfx::IntPoint m_layer_origin;
@ -43,6 +54,9 @@ private:
bool m_scaling { false };
Optional<ResizeAnchorLocation const> m_resize_anchor_location {};
bool m_keep_aspect_ratio { false };
RefPtr<GUI::Widget> m_properties_widget;
RefPtr<GUI::RadioButton> m_selection_mode_foreground;
RefPtr<GUI::RadioButton> m_selection_mode_active;
RefPtr<Gfx::Bitmap> m_cached_preview_bitmap { nullptr };
};