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

Disable changing to TilemapMode::Tiles when we aren't in a tilemap

Browse Source
This commit is contained in:
David Capello 2020-08-25 15:04:39 -03:00
parent 162f6d802a
commit a4ba4c92fd
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/ui/color_bar.cpp
View File

@ -510,10 +510,13 @@ TilemapMode ColorBar::tilemapMode() const
TilemapMode::Pixels; TilemapMode::Pixels;
} }
void ColorBar::setTilemapMode(const TilemapMode mode) void ColorBar::setTilemapMode(TilemapMode mode)
{ {
const Site site = UIContext::instance()->activeSite(); const Site site = UIContext::instance()->activeSite();
const bool isTilemap = (site.layer() && site.layer()->isTilemap()); const bool isTilemap = (site.layer() && site.layer()->isTilemap());
if (!isTilemap)
mode = TilemapMode::Pixels;
const bool editTiles = (mode == TilemapMode::Tiles); const bool editTiles = (mode == TilemapMode::Tiles);
SkinTheme* theme = static_cast<SkinTheme*>(this->theme()); SkinTheme* theme = static_cast<SkinTheme*>(this->theme());

2
src/app/ui/color_bar.h
View File

@ -89,7 +89,7 @@ namespace app {
void setEditMode(bool state); void setEditMode(bool state);
TilemapMode tilemapMode() const; TilemapMode tilemapMode() const;
void setTilemapMode(const TilemapMode mode); void setTilemapMode(TilemapMode mode);
TilesetMode tilesetMode() const; TilesetMode tilesetMode() const;
void setTilesetMode(const TilesetMode mode); void setTilesetMode(const TilesetMode mode);