beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-25 09:00:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

PixelPaint: Extract common scope code into a generic ScopeWidget

Browse source 
When we add more scopes, this will facilitate code sharing.
This commit is contained in:
kleines Filmröllchen 2022-08-16 22:43:11 +02:00 committed by Linus Groh
parent 8b60305698
commit fe88fd22fa
Notes: sideshowbarker 2024-07-17 07:32:29 +09:00 
Author: https://github.com/kleinesfilmroellchen
Commit: https://github.com/SerenityOS/serenity/commit/fe88fd22fa
Pull-request: https://github.com/SerenityOS/serenity/pull/14895
Reviewed-by: https://github.com/Hendiadyoin1
Reviewed-by: https://github.com/MacDue
Reviewed-by: https://github.com/linusg
Reviewed-by: https://github.com/trflynn89
5 changed files with 86 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Userland/Applications/PixelPaint/CMakeLists.txt
View file

@ -52,6 +52,7 @@ set(SOURCES
ProjectLoader.cpp
ResizeImageDialog.cpp
ResizeImageDialogGML.h
ScopeWidget.cpp
Selection.cpp
ToolPropertiesWidget.cpp
ToolboxWidget.cpp

40
Userland/Applications/PixelPaint/HistogramWidget.cpp
View file

@ -16,25 +16,6 @@ REGISTER_WIDGET(PixelPaint, HistogramWidget);
namespace PixelPaint {
HistogramWidget::~HistogramWidget()
{
if (m_image)
m_image->remove_client(*this);
}
void HistogramWidget::set_image(Image* image)
{
if (m_image == image)
return;
if (m_image)
m_image->remove_client(*this);
m_image = image;
if (m_image)
m_image->add_client(*this);
(void)rebuild_histogram_data();
}
ErrorOr<void> HistogramWidget::rebuild_histogram_data()
{
if (!m_image)
@ -81,16 +62,15 @@ ErrorOr<void> HistogramWidget::rebuild_histogram_data()
}
// Scale the frequency values to fit the widgets height.
m_widget_height = height();
auto widget_height = height();
for (int i = 0; i < 256; i++) {
m_data.red[i] = m_data.red[i] != 0 ? (static_cast<float>(m_data.red[i]) / max_color_frequency) * m_widget_height : 0;
m_data.green[i] = m_data.green[i] != 0 ? (static_cast<float>(m_data.green[i]) / max_color_frequency) * m_widget_height : 0;
m_data.blue[i] = m_data.blue[i] != 0 ? (static_cast<float>(m_data.blue[i]) / max_color_frequency) * m_widget_height : 0;
m_data.brightness[i] = m_data.brightness[i] != 0 ? (static_cast<float>(m_data.brightness[i]) / max_brightness_frequency) * m_widget_height : 0;
m_data.red[i] = m_data.red[i] != 0 ? (static_cast<float>(m_data.red[i]) / max_color_frequency) * widget_height : 0;
m_data.green[i] = m_data.green[i] != 0 ? (static_cast<float>(m_data.green[i]) / max_color_frequency) * widget_height : 0;
m_data.blue[i] = m_data.blue[i] != 0 ? (static_cast<float>(m_data.blue[i]) / max_color_frequency) * widget_height : 0;
m_data.brightness[i] = m_data.brightness[i] != 0 ? (static_cast<float>(m_data.brightness[i]) / max_brightness_frequency) * widget_height : 0;
}
update();
return {};
}
@ -102,7 +82,7 @@ void HistogramWidget::paint_event(GUI::PaintEvent& event)
if (!m_image)
return;
int bottom_line = m_widget_height - 1;
int bottom_line = height() - 1;
float step_width = static_cast<float>(width()) / 256;
Gfx::Path brightness_path;
@ -153,14 +133,6 @@ void HistogramWidget::paint_event(GUI::PaintEvent& event)
void HistogramWidget::image_changed()
{
(void)rebuild_histogram_data();
}
void HistogramWidget::set_color_at_mouseposition(Color color)
{
if (m_color_at_mouseposition == color)
return;
m_color_at_mouseposition = color;
update();
}

15
Userland/Applications/PixelPaint/HistogramWidget.h
View file

@ -7,21 +7,17 @@
#pragma once
#include "Image.h"
#include <LibGUI/AbstractScrollableWidget.h>
#include "ScopeWidget.h"
namespace PixelPaint {
class HistogramWidget final
: public GUI::Frame
, ImageClient {
: public ScopeWidget {
C_OBJECT(HistogramWidget);
public:
virtual ~HistogramWidget() override;
void set_image(Image*);
void image_changed();
void set_color_at_mouseposition(Color);
virtual ~HistogramWidget() = default;
virtual void image_changed() override;
private:
HistogramWidget() = default;
@ -29,9 +25,6 @@ private:
virtual void paint_event(GUI::PaintEvent&) override;
ErrorOr<void> rebuild_histogram_data();
int m_widget_height = 0;
Color m_color_at_mouseposition = Color::Transparent;
RefPtr<Image> m_image;
struct HistogramData {
Vector<int> red;

41
Userland/Applications/PixelPaint/ScopeWidget.cpp Normal file
View file

@ -0,0 +1,41 @@
/*
* Copyright (c) 2022, kleines Filmröllchen <filmroellchen@serenityos.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#include "ScopeWidget.h"
#include "Layer.h"
namespace PixelPaint {
ScopeWidget::~ScopeWidget()
{
if (m_image)
m_image->remove_client(*this);
}
void ScopeWidget::set_image(Image* image)
{
if (m_image == image)
return;
if (m_image)
m_image->remove_client(*this);
m_image = image;
if (m_image)
m_image->add_client(*this);
image_changed();
update();
}
void ScopeWidget::set_color_at_mouseposition(Color color)
{
if (m_color_at_mouseposition == color)
return;
m_color_at_mouseposition = color;
update();
}
}

34
Userland/Applications/PixelPaint/ScopeWidget.h Normal file
View file

@ -0,0 +1,34 @@
/*
* Copyright (c) 2022, kleines Filmröllchen <filmroellchen@serenityos.org>
*
* SPDX-License-Identifier: BSD-2-Clause
*/
#pragma once
#include "Image.h"
#include <LibCore/Object.h>
#include <LibGUI/Frame.h>
namespace PixelPaint {
class ScopeWidget
: public GUI::Frame
, public ImageClient {
C_OBJECT_ABSTRACT(ScopeWidget);
public:
virtual ~ScopeWidget() override;
void set_image(Image*);
virtual void image_changed() = 0;
void set_color_at_mouseposition(Color);
protected:
virtual void paint_event(GUI::PaintEvent&) override = 0;
Color m_color_at_mouseposition = Color::Transparent;
RefPtr<Image> m_image;
};
}