mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-02-21 21:41:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Color Range uses last active selection instead of active selection (fix #4045)

Browse Source
This commit is contained in:
Gaspar Capello 2023-09-19 12:48:59 -03:00 committed by David Capello
parent db0bc5c6bb
commit a0331743de
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/app/commands/cmd_mask_by_color.cpp
View File

@ -1,5 +1,5 @@
// Aseprite // Aseprite
// Copyright (C) 2018-2021 Igara Studio S.A. // Copyright (C) 2018-2023 Igara Studio S.A.
// Copyright (C) 2001-2018 David Capello // Copyright (C) 2001-2018 David Capello
// //
// This program is distributed under the terms of // This program is distributed under the terms of
@ -77,6 +77,7 @@ private:
CheckBox* m_checkPreview = nullptr; CheckBox* m_checkPreview = nullptr;
Slider* m_sliderTolerance = nullptr; Slider* m_sliderTolerance = nullptr;
SelModeField* m_selMode = nullptr; SelModeField* m_selMode = nullptr;
bool m_isOrigMaskVisible;
}; };
MaskByColorCommand::MaskByColorCommand() MaskByColorCommand::MaskByColorCommand()
@ -167,6 +168,10 @@ void MaskByColorCommand::onExecute(Context* context)
m_window->remapWindow(); m_window->remapWindow();
m_window->centerWindow(); m_window->centerWindow();
// Save original mask visibility to process it correctly in
// ADD/SUBTRACT/INTERSECT Selection Mode
m_isOrigMaskVisible = reader.document()->isMaskVisible();
// Mask first preview // Mask first preview
maskPreview(reader); maskPreview(reader);
@ -217,7 +222,7 @@ Mask* MaskByColorCommand::generateMask(const Mask& origMask,
mask->byColor(image, color, tolerance); mask->byColor(image, color, tolerance);
mask->offsetOrigin(xpos, ypos); mask->offsetOrigin(xpos, ypos);
if (!origMask.isEmpty()) { if (!origMask.isEmpty() && m_isOrigMaskVisible) {
switch (mode) { switch (mode) {
case gen::SelectionMode::DEFAULT: case gen::SelectionMode::DEFAULT:
break; break;