dmaax/ladybird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
ladybird/Userland/Applications/PixelPaint/Tools/PenTool.cpp

66 lines
1.8 KiB
C++
Raw Normal View History

Meta: Add license header to source files As suggested by Joshua, this commit adds the 2-clause BSD license as a comment block to the top of every source file. For the first pass, I've just added myself for simplicity. I encourage everyone to add themselves as copyright holders of any file they've added or modified in some significant way. If I've added myself in error somewhere, feel free to replace it with the appropriate copyright holder instead. Going forward, all new source files should include a license header.
2020-01-18 05:38:21 -03:00
/*
* Copyright (c) 2018-2020, Andreas Kling <kling@serenityos.org>
Everywhere: Use my fancy new serenityos.org email :^)
2021-09-13 17:48:22 -03:00
* Copyright (c) 2021, Mustafa Quraish <mustafa@serenityos.org>
Applications: Use default constructors/destructors https://isocpp.github.io/CppCoreGuidelines/CppCoreGuidelines#cother-other-default-operation-rules "The compiler is more likely to get the default semantics right and you cannot implement these functions better than the compiler."
2022-02-10 16:28:48 -03:00
* Copyright (c) 2022, the SerenityOS developers.
Meta: Add license header to source files As suggested by Joshua, this commit adds the 2-clause BSD license as a comment block to the top of every source file. For the first pass, I've just added myself for simplicity. I encourage everyone to add themselves as copyright holders of any file they've added or modified in some significant way. If I've added myself in error somewhere, feel free to replace it with the appropriate copyright holder instead. Going forward, all new source files should include a license header.
2020-01-18 05:38:21 -03:00
*
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 05:24:48 -03:00
* SPDX-License-Identifier: BSD-2-Clause
Meta: Add license header to source files As suggested by Joshua, this commit adds the 2-clause BSD license as a comment block to the top of every source file. For the first pass, I've just added myself for simplicity. I encourage everyone to add themselves as copyright holders of any file they've added or modified in some significant way. If I've added myself in error somewhere, feel free to replace it with the appropriate copyright holder instead. Going forward, all new source files should include a license header.
2020-01-18 05:38:21 -03:00
*/
PaintBrush: Factor out the pen tool into an actual PenTool class. Also add a Tool base class, and an empty BucketTool subclass which is the next thing to implement.
2019-06-14 13:51:57 -03:00
#include "PenTool.h"
PixelPaint: Move Tools to it's own subdirectory The PixelPaint source directory was getting a bit large, let's move all the Tools to it's own subdirectory. Also remove some unused includes.
2021-09-17 04:54:55 -03:00
#include "../ImageEditor.h"
#include "../Layer.h"
LibGUI: Remove leading G from filenames
2020-02-06 16:33:02 -03:00
#include <LibGUI/Action.h>
PixelPaint: Tool properties panel Each tool can have its own set of properties that can be modified through a panel on the right side. The tools I've added properties for are: Pen: Thickness Brush: Size Hardness Spray: Thickness Density Bucket: Threshold
2020-10-15 14:57:07 -03:00
#include <LibGUI/BoxLayout.h>
#include <LibGUI/Label.h>
LibGUI: Remove leading G from filenames
2020-02-06 16:33:02 -03:00
#include <LibGUI/Menu.h>
#include <LibGUI/Painter.h>
PixelPaint: Use the ValueSlider widget for Tool properties Use the new ValueSlider and get rid of the temporary solution with tooltips :^)
2021-08-05 14:36:38 -03:00
#include <LibGUI/ValueSlider.h>
PaintBrush: Factor out the pen tool into an actual PenTool class. Also add a Tool base class, and an empty BucketTool subclass which is the next thing to implement.
2019-06-14 13:51:57 -03:00
PixelPaint: Rename from PaintBrush :^)
2020-05-20 15:35:35 -03:00
namespace PixelPaint {
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 18:44:46 -03:00
PaintBrush: Factor out the pen tool into an actual PenTool class. Also add a Tool base class, and an empty BucketTool subclass which is the next thing to implement.
2019-06-14 13:51:57 -03:00
PenTool::PenTool()
{
PixelPaint: Make PenTool inherit from BrushTool Most of the logic implemented in PenTool was the same as BrushTool anyway, with the only difference being how the actual lines were drawn at the end. We now just override the `draw_line()` and `draw_point()` methods instead. We don't strictly need to override `draw_line()` here, but that would just result in repeated calls to `draw_point()`, which is wasteful. Also renamed "thickness"->"size" to have consistent terminology.
2021-09-08 00:16:13 -03:00
set_size(1);
PaintBrush: Factor out the pen tool into an actual PenTool class. Also add a Tool base class, and an empty BucketTool subclass which is the next thing to implement.
2019-06-14 13:51:57 -03:00
}
PixelPaint: Make PenTool inherit from BrushTool Most of the logic implemented in PenTool was the same as BrushTool anyway, with the only difference being how the actual lines were drawn at the end. We now just override the `draw_line()` and `draw_point()` methods instead. We don't strictly need to override `draw_line()` here, but that would just result in repeated calls to `draw_point()`, which is wasteful. Also renamed "thickness"->"size" to have consistent terminology.
2021-09-08 00:16:13 -03:00
void PenTool::draw_point(Gfx::Bitmap& bitmap, Gfx::Color const& color, Gfx::IntPoint const& point)
PaintBrush: Factor out the pen tool into an actual PenTool class. Also add a Tool base class, and an empty BucketTool subclass which is the next thing to implement.
2019-06-14 13:51:57 -03:00
{
PixelPaint: Make PenTool inherit from BrushTool Most of the logic implemented in PenTool was the same as BrushTool anyway, with the only difference being how the actual lines were drawn at the end. We now just override the `draw_line()` and `draw_point()` methods instead. We don't strictly need to override `draw_line()` here, but that would just result in repeated calls to `draw_point()`, which is wasteful. Also renamed "thickness"->"size" to have consistent terminology.
2021-09-08 00:16:13 -03:00
GUI::Painter painter(bitmap);
painter.draw_line(point, point, color, size());
PaintBrush: Factor out the pen tool into an actual PenTool class. Also add a Tool base class, and an empty BucketTool subclass which is the next thing to implement.
2019-06-14 13:51:57 -03:00
}
PixelPaint: Make PenTool inherit from BrushTool Most of the logic implemented in PenTool was the same as BrushTool anyway, with the only difference being how the actual lines were drawn at the end. We now just override the `draw_line()` and `draw_point()` methods instead. We don't strictly need to override `draw_line()` here, but that would just result in repeated calls to `draw_point()`, which is wasteful. Also renamed "thickness"->"size" to have consistent terminology.
2021-09-08 00:16:13 -03:00
void PenTool::draw_line(Gfx::Bitmap& bitmap, Gfx::Color const& color, Gfx::IntPoint const& start, Gfx::IntPoint const& end)
PaintBrush: Factor out the pen tool into an actual PenTool class. Also add a Tool base class, and an empty BucketTool subclass which is the next thing to implement.
2019-06-14 13:51:57 -03:00
{
PixelPaint: Make PenTool inherit from BrushTool Most of the logic implemented in PenTool was the same as BrushTool anyway, with the only difference being how the actual lines were drawn at the end. We now just override the `draw_line()` and `draw_point()` methods instead. We don't strictly need to override `draw_line()` here, but that would just result in repeated calls to `draw_point()`, which is wasteful. Also renamed "thickness"->"size" to have consistent terminology.
2021-09-08 00:16:13 -03:00
GUI::Painter painter(bitmap);
painter.draw_line(start, end, color, size());
PaintBrush: Factor out the pen tool into an actual PenTool class. Also add a Tool base class, and an empty BucketTool subclass which is the next thing to implement.
2019-06-14 13:51:57 -03:00
}
PaintBrush: Implement a thickness setting for the pen tool. Painter gains the ability to draw lines with arbitrary thickness. It's basically implemented by drawing filled rects for thickness>1. In PaintBrush, Tool classes can now override on_contextmenu() to provide a context menu for the toolbox button. :^)
2019-06-23 05:00:02 -03:00
PixelPaint: Tool properties panel Each tool can have its own set of properties that can be modified through a panel on the right side. The tools I've added properties for are: Pen: Thickness Brush: Size Hardness Spray: Thickness Density Bucket: Threshold
2020-10-15 14:57:07 -03:00
GUI::Widget* PenTool::get_properties_widget()
{
if (!m_properties_widget) {
m_properties_widget = GUI::Widget::construct();
m_properties_widget->set_layout<GUI::VerticalBoxLayout>();
PixelPaint: Make PenTool inherit from BrushTool Most of the logic implemented in PenTool was the same as BrushTool anyway, with the only difference being how the actual lines were drawn at the end. We now just override the `draw_line()` and `draw_point()` methods instead. We don't strictly need to override `draw_line()` here, but that would just result in repeated calls to `draw_point()`, which is wasteful. Also renamed "thickness"->"size" to have consistent terminology.
2021-09-08 00:16:13 -03:00
auto& size_container = m_properties_widget->add<GUI::Widget>();
size_container.set_fixed_height(20);
size_container.set_layout<GUI::HorizontalBoxLayout>();
PixelPaint: Tool properties panel Each tool can have its own set of properties that can be modified through a panel on the right side. The tools I've added properties for are: Pen: Thickness Brush: Size Hardness Spray: Thickness Density Bucket: Threshold
2020-10-15 14:57:07 -03:00
PixelPaint: Make PenTool inherit from BrushTool Most of the logic implemented in PenTool was the same as BrushTool anyway, with the only difference being how the actual lines were drawn at the end. We now just override the `draw_line()` and `draw_point()` methods instead. We don't strictly need to override `draw_line()` here, but that would just result in repeated calls to `draw_point()`, which is wasteful. Also renamed "thickness"->"size" to have consistent terminology.
2021-09-08 00:16:13 -03:00
auto& size_label = size_container.add<GUI::Label>("Thickness:");
size_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
size_label.set_fixed_size(80, 20);
PixelPaint: Tool properties panel Each tool can have its own set of properties that can be modified through a panel on the right side. The tools I've added properties for are: Pen: Thickness Brush: Size Hardness Spray: Thickness Density Bucket: Threshold
2020-10-15 14:57:07 -03:00
PixelPaint: Make PenTool inherit from BrushTool Most of the logic implemented in PenTool was the same as BrushTool anyway, with the only difference being how the actual lines were drawn at the end. We now just override the `draw_line()` and `draw_point()` methods instead. We don't strictly need to override `draw_line()` here, but that would just result in repeated calls to `draw_point()`, which is wasteful. Also renamed "thickness"->"size" to have consistent terminology.
2021-09-08 00:16:13 -03:00
auto& size_slider = size_container.add<GUI::ValueSlider>(Orientation::Horizontal, "px");
size_slider.set_range(1, 20);
size_slider.set_value(size());
PixelPaint: Add tooltips for sliders in ToolPropertiesWidget This adds a tooltip to all the slider properties showing their current value. Previously there was no indication of what value they had. Also rename the SprayTool property 'thickness' to 'size' like BrushTool calls it.
2021-08-03 07:46:10 -03:00
PixelPaint: Make PenTool inherit from BrushTool Most of the logic implemented in PenTool was the same as BrushTool anyway, with the only difference being how the actual lines were drawn at the end. We now just override the `draw_line()` and `draw_point()` methods instead. We don't strictly need to override `draw_line()` here, but that would just result in repeated calls to `draw_point()`, which is wasteful. Also renamed "thickness"->"size" to have consistent terminology.
2021-09-08 00:16:13 -03:00
size_slider.on_change = [&](int value) {
set_size(value);
PixelPaint: Tool properties panel Each tool can have its own set of properties that can be modified through a panel on the right side. The tools I've added properties for are: Pen: Thickness Brush: Size Hardness Spray: Thickness Density Bucket: Threshold
2020-10-15 14:57:07 -03:00
};
PixelPaint: Make PenTool inherit from BrushTool Most of the logic implemented in PenTool was the same as BrushTool anyway, with the only difference being how the actual lines were drawn at the end. We now just override the `draw_line()` and `draw_point()` methods instead. We don't strictly need to override `draw_line()` here, but that would just result in repeated calls to `draw_point()`, which is wasteful. Also renamed "thickness"->"size" to have consistent terminology.
2021-09-08 00:16:13 -03:00
set_primary_slider(&size_slider);
PixelPaint: Tool properties panel Each tool can have its own set of properties that can be modified through a panel on the right side. The tools I've added properties for are: Pen: Thickness Brush: Size Hardness Spray: Thickness Density Bucket: Threshold
2020-10-15 14:57:07 -03:00
}
return m_properties_widget.ptr();
}
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 18:44:46 -03:00
}
Reference in a new issue Copy permalink