mirrors/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-01-26 19:22:30 -05:00
Code Issues Projects Releases Packages Wiki Activity
ladybird/Userland/Applications/PixelPaint/ImageEditor.h

111 lines
3.3 KiB
C
Raw Normal View History

PaintBrush: Start refactoring to support layer-based images The main editing widget is now the new ImageEditor widget, which works on an Image object, which internally has a stack of Layer objects. Layers are composited back-to-front when painting the Image inside an ImageEditor.
2020-05-12 22:22:45 +02:00
/*
* Copyright (c) 2020, Andreas Kling <kling@serenityos.org>
*
Everything: Move to SPDX license identifiers in all files. SPDX License Identifiers are a more compact / standardized way of representing file license information. See: https://spdx.dev/resources/use/#identifiers This was done with the `ambr` search and replace tool. ambr --no-parent-ignore --key-from-file --rep-from-file key.txt rep.txt *
2021-04-22 01:24:48 -07:00
* SPDX-License-Identifier: BSD-2-Clause
PaintBrush: Start refactoring to support layer-based images The main editing widget is now the new ImageEditor widget, which works on an Image object, which internally has a stack of Layer objects. Layers are composited back-to-front when painting the Image inside an ImageEditor.
2020-05-12 22:22:45 +02:00
*/
#pragma once
PixelPaint: Have layers and images send out notifications on changes We use this to automatically update the thumbnail in LayerListWidget when you draw into a layer. We also use it to repaint the ImageEditor when the image changes somehow. :^)
2020-05-25 22:49:50 +02:00
#include "Image.h"
PaintBrush: Start refactoring to support layer-based images The main editing widget is now the new ImageEditor widget, which works on an Image object, which internally has a stack of Layer objects. Layers are composited back-to-front when painting the Image inside an ImageEditor.
2020-05-12 22:22:45 +02:00
#include <LibGUI/Frame.h>
PixelPaint: Use UndoStack instead of History This allows to share more code with other undo systems.
2020-11-13 13:19:24 +00:00
#include <LibGUI/UndoStack.h>
LibGfx: Templatize Point, Size, and Rect
2020-07-25 21:31:47 -07:00
#include <LibGfx/Point.h>
PaintBrush: Start refactoring to support layer-based images The main editing widget is now the new ImageEditor widget, which works on an Image object, which internally has a stack of Layer objects. Layers are composited back-to-front when painting the Image inside an ImageEditor.
2020-05-12 22:22:45 +02:00
PixelPaint: Rename from PaintBrush :^)
2020-05-20 20:35:35 +02:00
namespace PixelPaint {
PaintBrush: Start refactoring to support layer-based images The main editing widget is now the new ImageEditor widget, which works on an Image object, which internally has a stack of Layer objects. Layers are composited back-to-front when painting the Image inside an ImageEditor.
2020-05-12 22:22:45 +02:00
PaintBrush: Show the layer stack in a table view on the right hand side
2020-05-12 23:00:23 +02:00
class Layer;
PaintBrush: Port all the existing toolbox tools to the Layer world :^) Many tools are not working perfectly right yet, but we'll fix them!
2020-05-12 23:44:46 +02:00
class Tool;
PaintBrush: Start refactoring to support layer-based images The main editing widget is now the new ImageEditor widget, which works on an Image object, which internally has a stack of Layer objects. Layers are composited back-to-front when painting the Image inside an ImageEditor.
2020-05-12 22:22:45 +02:00
PixelPaint: Have layers and images send out notifications on changes We use this to automatically update the thumbnail in LayerListWidget when you draw into a layer. We also use it to repaint the ImageEditor when the image changes somehow. :^)
2020-05-25 22:49:50 +02:00
class ImageEditor final
: public GUI::Frame
, public ImageClient {
PaintBrush: Start refactoring to support layer-based images The main editing widget is now the new ImageEditor widget, which works on an Image object, which internally has a stack of Layer objects. Layers are composited back-to-front when painting the Image inside an ImageEditor.
2020-05-12 22:22:45 +02:00
C_OBJECT(ImageEditor);
public:
PixelPaint: Allow reordering layer by dragging them in LayerListWidget This is rather cool! :^)
2020-05-25 23:48:09 +02:00
virtual ~ImageEditor() override;
PaintBrush: Start refactoring to support layer-based images The main editing widget is now the new ImageEditor widget, which works on an Image object, which internally has a stack of Layer objects. Layers are composited back-to-front when painting the Image inside an ImageEditor.
2020-05-12 22:22:45 +02:00
const Image* image() const { return m_image; }
Image* image() { return m_image; }
void set_image(RefPtr<Image>);
PaintBrush: Show the layer stack in a table view on the right hand side
2020-05-12 23:00:23 +02:00
Layer* active_layer() { return m_active_layer; }
void set_active_layer(Layer*);
PaintBrush: Port all the existing toolbox tools to the Layer world :^) Many tools are not working perfectly right yet, but we'll fix them!
2020-05-12 23:44:46 +02:00
Tool* active_tool() { return m_active_tool; }
void set_active_tool(Tool*);
PixelPaint: Undo and redo actions The most used feature of any image editor, undo. Each tool now notifies the ImageEditor that they completed an action, where it'll take a snapshot if its current state. For now, a snapshot is just a copy of the whole image and its layers. There's a hard limit on the amount of actions it stores.
2020-10-17 16:47:34 +00:00
void did_complete_action();
bool undo();
bool redo();
PaintBrush: Update the LayerModel when moving layers around This ensures that the layer table view always shows the correct coordinates for the layer.
2020-05-13 00:21:13 +02:00
void layers_did_change();
LibGfx: Rename Rect,Point,Size => IntRect,IntPoint,IntSize This fits nicer with FloatRect,FloatPoint,FloatSize and gives a much better visual clue about what type of metric is being used.
2020-06-10 10:57:59 +02:00
Layer* layer_at_editor_position(const Gfx::IntPoint&);
PaintBrush: Switch the active layer when clicking one with move tool This feels very intuitive and nice, although maybe we need some way to override this behavior for the scenario where you're intending to move something currently behind something else.
2020-05-13 21:46:19 +02:00
PixelPaint: ImageEditor scaling method Moved the code on mousewheel_event to its own function.
2021-03-22 14:33:30 -03:00
void scale_centered_on_position(const Gfx::IntPoint&, float);
PixelPaint: Add Zoom Reset button to new View Menubar. If you lose your image while panning and zooming around, it is handy to have a reset function to get back home. :^)
2021-04-15 21:09:25 -04:00
void reset_scale_and_position();
PixelPaint: Add keyboard zoom shortcuts You can now use Ctrl+= and Ctrl+- to zoom in and out.
2021-04-15 22:06:25 -04:00
void scale_by(float);
PixelPaint: ImageEditor scaling method Moved the code on mousewheel_event to its own function.
2021-03-22 14:33:30 -03:00
PaintBrush: Remove the PaintableWidget Moved the current colors to ImageEditor for now, although I don't think that will be their final home.
2020-05-13 12:47:47 +02:00
Color primary_color() const { return m_primary_color; }
void set_primary_color(Color);
Color secondary_color() const { return m_secondary_color; }
void set_secondary_color(Color);
Color color_for(const GUI::MouseEvent&) const;
Color color_for(GUI::MouseButton) const;
Function<void(Color)> on_primary_color_change;
Function<void(Color)> on_secondary_color_change;
PixelPaint: Add selection functionality to the LayerListWidget Now we can get rid of the old table view and with it the LayerModel.
2020-05-26 09:51:28 +02:00
Function<void(Layer*)> on_active_layer_change;
PaintBrush: Switch the active layer when clicking one with move tool This feels very intuitive and nice, although maybe we need some way to override this behavior for the scenario where you're intending to move something currently behind something else.
2020-05-13 21:46:19 +02:00
LibGfx: Rename Rect,Point,Size => IntRect,IntPoint,IntSize This fits nicer with FloatRect,FloatPoint,FloatSize and gives a much better visual clue about what type of metric is being used.
2020-06-10 10:57:59 +02:00
Gfx::FloatRect layer_rect_to_editor_rect(const Layer&, const Gfx::IntRect&) const;
Gfx::FloatRect image_rect_to_editor_rect(const Gfx::IntRect&) const;
Gfx::FloatRect editor_rect_to_image_rect(const Gfx::IntRect&) const;
Gfx::FloatPoint layer_position_to_editor_position(const Layer&, const Gfx::IntPoint&) const;
Gfx::FloatPoint image_position_to_editor_position(const Gfx::IntPoint&) const;
Gfx::FloatPoint editor_position_to_image_position(const Gfx::IntPoint&) const;
PixelPaint: Make the LineTool previews work while zoomed in
2020-05-22 14:45:14 +02:00
PaintBrush: Start refactoring to support layer-based images The main editing widget is now the new ImageEditor widget, which works on an Image object, which internally has a stack of Layer objects. Layers are composited back-to-front when painting the Image inside an ImageEditor.
2020-05-12 22:22:45 +02:00
private:
ImageEditor();
virtual void paint_event(GUI::PaintEvent&) override;
PaintBrush: Make the line, rectangle and ellipsis preview work again You can now see what you're drawing before committing to it. This works by passing the second_paint_event from the ImageEditor to the tool. We also pass the active layer which makes it easier for the tool to keep his logic in layer-relative coordinates even while drawing preview states directly into the ImageEditor backing bitmap.
2020-05-13 13:41:12 +02:00
virtual void second_paint_event(GUI::PaintEvent&) override;
PaintBrush: Port all the existing toolbox tools to the Layer world :^) Many tools are not working perfectly right yet, but we'll fix them!
2020-05-12 23:44:46 +02:00
virtual void mousedown_event(GUI::MouseEvent&) override;
virtual void mousemove_event(GUI::MouseEvent&) override;
virtual void mouseup_event(GUI::MouseEvent&) override;
PixelPaint: Support panning and scaling the image we're working on :^) ImageEditor now supports panning (Ctrl+MiddleMouse) and scaling (Wheel) the image. This took a lot of unpleasant coordinate math, but now it actually kinda works and feels awesome! :^)
2020-05-20 22:29:04 +02:00
virtual void mousewheel_event(GUI::MouseEvent&) override;
PaintBrush: Make ImageEditor forward keydown and keyup events to tool
2020-05-13 13:20:25 +02:00
virtual void keydown_event(GUI::KeyEvent&) override;
virtual void keyup_event(GUI::KeyEvent&) override;
PaintBrush: Add move tool context menu with "move to back/front" Tools can now have an in-image context menu which you get when right- clicking inside the image editing area. Our first use of this is to provide the ability to move layers to the back/front. :^)
2020-05-13 22:03:29 +02:00
virtual void context_menu_event(GUI::ContextMenuEvent&) override;
PixelPaint: Support panning and scaling the image we're working on :^) ImageEditor now supports panning (Ctrl+MiddleMouse) and scaling (Wheel) the image. This took a lot of unpleasant coordinate math, but now it actually kinda works and feels awesome! :^)
2020-05-20 22:29:04 +02:00
virtual void resize_event(GUI::ResizeEvent&) override;
PixelPaint: Have layers and images send out notifications on changes We use this to automatically update the thumbnail in LayerListWidget when you draw into a layer. We also use it to repaint the ImageEditor when the image changes somehow. :^)
2020-05-25 22:49:50 +02:00
virtual void image_did_change() override;
PixelPaint: Undo and redo actions The most used feature of any image editor, undo. Each tool now notifies the ImageEditor that they completed an action, where it'll take a snapshot if its current state. For now, a snapshot is just a copy of the whole image and its layers. There's a hard limit on the amount of actions it stores.
2020-10-17 16:47:34 +00:00
virtual void image_select_layer(Layer*) override;
PixelPaint: Have layers and images send out notifications on changes We use this to automatically update the thumbnail in LayerListWidget when you draw into a layer. We also use it to repaint the ImageEditor when the image changes somehow. :^)
2020-05-25 22:49:50 +02:00
PixelPaint: Support panning and scaling the image we're working on :^) ImageEditor now supports panning (Ctrl+MiddleMouse) and scaling (Wheel) the image. This took a lot of unpleasant coordinate math, but now it actually kinda works and feels awesome! :^)
2020-05-20 22:29:04 +02:00
GUI::MouseEvent event_adjusted_for_layer(const GUI::MouseEvent&, const Layer&) const;
GUI::MouseEvent event_with_pan_and_scale_applied(const GUI::MouseEvent&) const;
PixelPaint: Add keyboard zoom shortcuts You can now use Ctrl+= and Ctrl+- to zoom in and out.
2021-04-15 22:06:25 -04:00
void clamped_scale(float);
PixelPaint: Support panning and scaling the image we're working on :^) ImageEditor now supports panning (Ctrl+MiddleMouse) and scaling (Wheel) the image. This took a lot of unpleasant coordinate math, but now it actually kinda works and feels awesome! :^)
2020-05-20 22:29:04 +02:00
void relayout();
PaintBrush: Start refactoring to support layer-based images The main editing widget is now the new ImageEditor widget, which works on an Image object, which internally has a stack of Layer objects. Layers are composited back-to-front when painting the Image inside an ImageEditor.
2020-05-12 22:22:45 +02:00
RefPtr<Image> m_image;
PaintBrush: Show the layer stack in a table view on the right hand side
2020-05-12 23:00:23 +02:00
RefPtr<Layer> m_active_layer;
PixelPaint: Use UndoStack instead of History This allows to share more code with other undo systems.
2020-11-13 13:19:24 +00:00
OwnPtr<GUI::UndoStack> m_undo_stack;
PaintBrush: Port all the existing toolbox tools to the Layer world :^) Many tools are not working perfectly right yet, but we'll fix them!
2020-05-12 23:44:46 +02:00
Tool* m_active_tool { nullptr };
PaintBrush: Remove the PaintableWidget Moved the current colors to ImageEditor for now, although I don't think that will be their final home.
2020-05-13 12:47:47 +02:00
Color m_primary_color { Color::Black };
Color m_secondary_color { Color::White };
PixelPaint: Support panning and scaling the image we're working on :^) ImageEditor now supports panning (Ctrl+MiddleMouse) and scaling (Wheel) the image. This took a lot of unpleasant coordinate math, but now it actually kinda works and feels awesome! :^)
2020-05-20 22:29:04 +02:00
LibGfx: Rename Rect,Point,Size => IntRect,IntPoint,IntSize This fits nicer with FloatRect,FloatPoint,FloatSize and gives a much better visual clue about what type of metric is being used.
2020-06-10 10:57:59 +02:00
Gfx::IntRect m_editor_image_rect;
PixelPaint: Support panning and scaling the image we're working on :^) ImageEditor now supports panning (Ctrl+MiddleMouse) and scaling (Wheel) the image. This took a lot of unpleasant coordinate math, but now it actually kinda works and feels awesome! :^)
2020-05-20 22:29:04 +02:00
float m_scale { 1 };
Gfx::FloatPoint m_pan_origin;
Gfx::FloatPoint m_saved_pan_origin;
LibGfx: Rename Rect,Point,Size => IntRect,IntPoint,IntSize This fits nicer with FloatRect,FloatPoint,FloatSize and gives a much better visual clue about what type of metric is being used.
2020-06-10 10:57:59 +02:00
Gfx::IntPoint m_click_position;
PaintBrush: Start refactoring to support layer-based images The main editing widget is now the new ImageEditor widget, which works on an Image object, which internally has a stack of Layer objects. Layers are composited back-to-front when painting the Image inside an ImageEditor.
2020-05-12 22:22:45 +02:00
};
}
Reference in a new issue Copy permalink