mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-10-03 21:46:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix eyedropper when picking tiles from composed image

Browse Source 
When eyedropper was used to pick tiles from a composed image having an
image layer and a tilemap layer without cels, it tried to pick tiles
from the image layer.
This commit is contained in:
Martín Capello 2021-04-05 16:06:52 -03:00 committed by David Capello
parent 079f7b6537
commit 783802a980
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/app/color_picker.cpp
View File

@ -134,12 +134,13 @@ void ColorPicker::pickColor(const Site& site,
m_layer = cels.front()->layer();
if (site.tilemapMode() == TilemapMode::Tiles) {
if (!cels.empty()) {
const gfx::Point tilePos = site.grid().canvasToTile(gfx::Point(pos));
if (cels.front()->image()->bounds().contains(tilePos)) {
m_tile = doc::get_pixel(cels.front()->image(), tilePos.x, tilePos.y);
m_color = app::Color::fromIndex(m_tile);
}
if (cels.empty() || !cels.front()->image()->isTilemap())
return;
const gfx::Point tilePos = site.grid().canvasToTile(gfx::Point(pos));
if (cels.front()->image()->bounds().contains(tilePos)) {
m_tile = doc::get_pixel(cels.front()->image(), tilePos.x, tilePos.y);
m_color = app::Color::fromIndex(m_tile);
}
}
else if (site.tilemapMode() == TilemapMode::Pixels) {