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

PixelPaint: Move title and path from Image to ImageEditor

Browse source 
As noted in the latest hacking video, it doesn't seem to make much
sense to store the title and path in the image itself. These fields
have now been moved to the actual ImageEditor itself.

This allows some nice simplicfications, including getting rid of the
`image_did_change_title` hook of ImageClient (which was just a way to
report back to the editor that the title had changed).
This commit is contained in:
Mustafa Quraish 2022-01-04 21:42:26 -05:00 • committed by Andreas Kling
parent 0b43a92eed
commit 2440d2c2fe
6 changed files with 45 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Userland/Applications/PixelPaint/ImageEditor.h
View file

@ -1,7 +1,7 @@
/*
* Copyright (c) 2020, Andreas Kling <kling@serenityos.org>
* Copyright (c) 2021, Tobias Christiansen <tobyase@serenityos.org>
* Copyright (c) 2021, Mustafa Quraish <mustafa@serenityos.org>
* Copyright (c) 2021-2022, Mustafa Quraish <mustafa@serenityos.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
@ -45,6 +45,12 @@ public:
auto& undo_stack() { return m_undo_stack; }
String const& path() const { return m_path; }
void set_path(String);
String const& title() const { return m_title; }
void set_title(String);
void add_guide(NonnullRefPtr<Guide> guide) { m_guides.append(guide); }
void remove_guide(Guide const& guide)
{
@ -90,7 +96,7 @@ public:
Function<void(Layer*)> on_active_layer_change;
Function<void(String const&)> on_image_title_change;
Function<void(String const&)> on_title_change;
Function<void(Gfx::IntPoint const&)> on_image_mouse_position_change;
@ -139,7 +145,6 @@ private:
virtual void image_did_change(Gfx::IntRect const&) override;
virtual void image_did_change_rect(Gfx::IntRect const&) override;
virtual void image_select_layer(Layer*) override;
virtual void image_did_change_title(String const&) override;
GUI::MouseEvent event_adjusted_for_layer(GUI::MouseEvent const&, Layer const&) const;
GUI::MouseEvent event_with_pan_and_scale_applied(GUI::MouseEvent const&) const;
@ -155,6 +160,9 @@ private:
RefPtr<Layer> m_active_layer;
GUI::UndoStack m_undo_stack;
String m_path;
String m_title;
NonnullRefPtrVector<Guide> m_guides;
bool m_show_guides { true };
bool m_show_rulers { true };