From fa9dfa3da12ac9b910c2c7db4f98e7530f165053 Mon Sep 17 00:00:00 2001 From: lucastarche Date: Mon, 22 Mar 2021 14:34:20 -0300 Subject: [PATCH] PixelPaint: Added Zoom tool --- Base/res/icons/pixelpaint/zoom.png | Bin 0 -> 913 bytes .../Applications/PixelPaint/CMakeLists.txt | 1 + .../Applications/PixelPaint/ToolboxWidget.cpp | 2 + Userland/Applications/PixelPaint/ZoomTool.cpp | 78 ++++++++++++++++++ Userland/Applications/PixelPaint/ZoomTool.h | 48 +++++++++++ 5 files changed, 129 insertions(+) create mode 100644 Base/res/icons/pixelpaint/zoom.png create mode 100644 Userland/Applications/PixelPaint/ZoomTool.cpp create mode 100644 Userland/Applications/PixelPaint/ZoomTool.h diff --git a/Base/res/icons/pixelpaint/zoom.png b/Base/res/icons/pixelpaint/zoom.png new file mode 100644 index 0000000000000000000000000000000000000000..5ecb307700e790e01f3213c4fc34c4f786fd7c08 GIT binary patch literal 913 zcmeAS@N?(olHy`uVBq!ia0y~yV2}b~4mJh`hLv7E=NK3mTQZ%U13aCb6$*;-(=u~X z85lGs)=sqbIP4&EG(LK%k|=9;hegT?KV1*e!Yf)L3!PSoMwJ@u{K7rUL`74tuPOWB z!TzJGn!7iz<6GCH@PqNuvu8_QD5?I_*WA+a@xc!H_wQ`q-DCXc*19t7I?IBrX%qd_ zT5|G2Irb?vDDo)utvKRS>n9TYK_>qDhmT+Nj&0s^{;%b)DSJ*b%y+OkU2<6Ip2EC) zTT0ITK9U$VN#s%SqZN+gDs@kGz4;{le9_^$d6H&EFDoAzYz%mlu(LVxWI*Tg4&|;@ zf&1)VZ#q=jy*X;-#%s1ext%L>Q)j+5ai4fZX_|slLyy#{6$hMp!g@u7GjI7<{BW1q z@1Zv{Ce@%wX91V!q{r<4oA2M9)p~NrY!NSpyZYPy8nUsJH>Ta)w!c4jcO?_cyhiP{ zZ`YeO%=EwXI#;)dSG252F?PH$YKTtJ!KGP ztXOJa#=yY9UgGKN%KnsDOpw>Y;&|*d1_lPn64!_l=ltB<)VvY~=c3falGGH1^30M9 z1$R&1fbd2>aRvs)YEKu(5Rc<~rx|)2b`WX%FK*SvrPSodrN<~(xO=v&>?;+G8&@M^ zWMhur3_aKsY;9q6KUYbqMDW!T1*MR}dOpSDPhY8)XMSjR_&jM(|M!2#cMBOGR#!6O zpE=W@F)HV?g{PxMKrP|$ss{V(b04fU*7oo^8I{d& z;LAx~hJ@T?VTOV&cJ^T>Z(ft($ZFyWb-z9I|rgS=Tq-_kX^&G|MZmc0?Lb?Ige U3UXY}z`(%Z>FVdQ&MBb@05NuzlmGw# literal 0 HcmV?d00001 diff --git a/Userland/Applications/PixelPaint/CMakeLists.txt b/Userland/Applications/PixelPaint/CMakeLists.txt index 713845c80e..c462c8405c 100644 --- a/Userland/Applications/PixelPaint/CMakeLists.txt +++ b/Userland/Applications/PixelPaint/CMakeLists.txt @@ -21,6 +21,7 @@ set(SOURCES ToolboxWidget.cpp ToolPropertiesWidget.cpp Tool.cpp + ZoomTool.cpp ) serenity_app(PixelPaint ICON app-pixel-paint) diff --git a/Userland/Applications/PixelPaint/ToolboxWidget.cpp b/Userland/Applications/PixelPaint/ToolboxWidget.cpp index c746901887..de853a55cb 100644 --- a/Userland/Applications/PixelPaint/ToolboxWidget.cpp +++ b/Userland/Applications/PixelPaint/ToolboxWidget.cpp @@ -35,6 +35,7 @@ #include "PickerTool.h" #include "RectangleTool.h" #include "SprayTool.h" +#include "ZoomTool.h" #include #include #include @@ -135,6 +136,7 @@ void ToolboxWidget::setup_tools() add_tool("Line", "line", { Mod_Ctrl | Mod_Shift, Key_L }, make()); add_tool("Rectangle", "rectangle", { Mod_Ctrl | Mod_Shift, Key_R }, make()); add_tool("Ellipse", "circle", { Mod_Ctrl | Mod_Shift, Key_E }, make()); + add_tool("Zoom", "zoom", { 0, Key_Z }, make()); } } diff --git a/Userland/Applications/PixelPaint/ZoomTool.cpp b/Userland/Applications/PixelPaint/ZoomTool.cpp new file mode 100644 index 0000000000..f4da5c6e63 --- /dev/null +++ b/Userland/Applications/PixelPaint/ZoomTool.cpp @@ -0,0 +1,78 @@ +/* + * Copyright (c) 2021, the SerenityOS developers. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "ZoomTool.h" +#include "ImageEditor.h" +#include +#include +#include + +namespace PixelPaint { + +ZoomTool::ZoomTool() +{ +} + +ZoomTool::~ZoomTool() +{ +} + +void ZoomTool::on_mousedown(Layer&, GUI::MouseEvent& event, GUI::MouseEvent&) +{ + if (event.button() != GUI::MouseButton::Left && event.button() != GUI::MouseButton::Right) + return; + + auto scale_factor = (event.button() == GUI::MouseButton::Left) ? m_sensitivity : -m_sensitivity; + m_editor->scale_centered_on_position(event.position(), scale_factor); +} + +GUI::Widget* ZoomTool::get_properties_widget() +{ + if (!m_properties_widget) { + m_properties_widget = GUI::Widget::construct(); + m_properties_widget->set_layout(); + + auto& sensitivity_container = m_properties_widget->add(); + sensitivity_container.set_fixed_height(20); + sensitivity_container.set_layout(); + + auto& sensitivity_label = sensitivity_container.add("Sensitivity:"); + sensitivity_label.set_text_alignment(Gfx::TextAlignment::CenterLeft); + sensitivity_label.set_fixed_size(80, 20); + + auto& sensitivity_slider = sensitivity_container.add(); + sensitivity_slider.set_fixed_height(20); + sensitivity_slider.set_range(1, 100); + sensitivity_slider.set_value(100 * m_sensitivity); + sensitivity_slider.on_change = [this](int value) { + m_sensitivity = (double)value / 100.0; + }; + } + + return m_properties_widget.ptr(); +} + +} diff --git a/Userland/Applications/PixelPaint/ZoomTool.h b/Userland/Applications/PixelPaint/ZoomTool.h new file mode 100644 index 0000000000..6a888b4497 --- /dev/null +++ b/Userland/Applications/PixelPaint/ZoomTool.h @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2021, the SerenityOS developers. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#pragma once + +#include "Tool.h" +#include +#include + +namespace PixelPaint { + +class ZoomTool final : public Tool { +public: + ZoomTool(); + virtual ~ZoomTool() override; + + virtual void on_mousedown(Layer&, GUI::MouseEvent& layer_event, GUI::MouseEvent& image_event) override; + virtual GUI::Widget* get_properties_widget() override; + +private: + RefPtr m_properties_widget; + double m_sensitivity { 0.1 }; +}; + +}