mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-01-29 03:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Magic Wand doesn't work correctly in Tiled Mode (fix #4659)

Browse Source
This commit is contained in:
Gaspar Capello 2024-10-24 17:07:34 -03:00 committed by David Capello
parent 77e0944baa
commit f7a9f44cec
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/tools/tool_loop.h
View File

@ -1,5 +1,5 @@
// Aseprite // Aseprite
// Copyright (C) 2019-2022 Igara Studio S.A. // Copyright (C) 2019-2024 Igara Studio S.A.
// Copyright (C) 2001-2017 David Capello // Copyright (C) 2001-2017 David Capello
// //
// This program is distributed under the terms of // This program is distributed under the terms of
@ -207,6 +207,7 @@ namespace app {
virtual const doc::Grid& getGrid() const = 0; virtual const doc::Grid& getGrid() const = 0;
virtual gfx::Rect getGridBounds() = 0; virtual gfx::Rect getGridBounds() = 0;
virtual bool isPixelConnectivityEightConnected() = 0; virtual bool isPixelConnectivityEightConnected() = 0;
virtual bool isPointInsideCanvas(const gfx::Point& point) = 0;
// Returns true if the figure must be filled when we release the // Returns true if the figure must be filled when we release the
// mouse (e.g. a filled rectangle, etc.) // mouse (e.g. a filled rectangle, etc.)

3
src/app/tools/tool_loop_manager.cpp
View File

@ -154,9 +154,8 @@ bool ToolLoopManager::releaseButton(const Pointer& pointer)
if (m_toolLoop->getController()->isOnePoint() && if (m_toolLoop->getController()->isOnePoint() &&
m_toolLoop->getInk()->isSelection() && m_toolLoop->getInk()->isSelection() &&
!m_toolLoop->getSrcImage()->bounds().contains(pointer.point())) { !m_toolLoop->isPointInsideCanvas(pointer.point()))
return false; return false;
}
Stroke::Pt spritePoint = getSpriteStrokePt(pointer); Stroke::Pt spritePoint = getSpriteStrokePt(pointer);
bool res = m_toolLoop->getController()->releaseButton(m_stroke, spritePoint); bool res = m_toolLoop->getController()->releaseButton(m_stroke, spritePoint);

9
src/app/ui/editor/tool_loop_impl.cpp
View File

@ -360,6 +360,15 @@ public:
== app::gen::PixelConnectivity::EIGHT_CONNECTED); == app::gen::PixelConnectivity::EIGHT_CONNECTED);
} }
bool isPointInsideCanvas(const gfx::Point& point) override {
const int a = ((getTiledMode() == TiledMode::X_AXIS ||
getTiledMode() == TiledMode::BOTH) ? 3 : 1);
const int b = ((getTiledMode() == TiledMode::Y_AXIS ||
getTiledMode() == TiledMode::BOTH) ? 3 : 1);
return 0 <= point.x && point.x < a * sprite()->size().w &&
0 <= point.y && point.y < b * sprite()->size().h;
}
const doc::Grid& getGrid() const override { return m_grid; } const doc::Grid& getGrid() const override { return m_grid; }
gfx::Rect getGridBounds() override { return m_gridBounds; } gfx::Rect getGridBounds() override { return m_gridBounds; }
gfx::Point getCelOrigin() override { return m_celOrigin; } gfx::Point getCelOrigin() override { return m_celOrigin; }