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

Use grid bounds by default in Import Sprite Sheet (fix #1207)

Browse Source
This commit is contained in:
David Capello 2016-07-25 11:30:33 -03:00
parent ed7a1ef1cc
commit 0c6802cd30
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/pref.xml
View File

@ -290,7 +290,7 @@
</section> </section>
<section id="import_sprite_sheet"> <section id="import_sprite_sheet">
<option id="type" type="app::SpriteSheetType" default="app::SpriteSheetType::Rows" /> <option id="type" type="app::SpriteSheetType" default="app::SpriteSheetType::Rows" />
<option id="bounds" type="gfx::Rect" default="gfx::Rect(0, 0, 16, 16)" /> <option id="bounds" type="gfx::Rect" default="gfx::Rect(0, 0, 0, 0)" />
<option id="partial_tiles" type="bool" default="false" /> <option id="partial_tiles" type="bool" default="false" />
</section> </section>
<section id="preview" text="Preview"> <section id="preview" text="Preview">

6
src/app/commands/cmd_import_sprite_sheet.cpp
View File

@ -217,7 +217,11 @@ private:
else else
sheetType()->setSelectedItemIndex((int)app::SpriteSheetType::Rows-1); sheetType()->setSelectedItemIndex((int)app::SpriteSheetType::Rows-1);
onChangeRectangle(m_docPref->importSpriteSheet.bounds()); gfx::Rect defBounds = m_docPref->importSpriteSheet.bounds();
if (defBounds.isEmpty())
defBounds = m_docPref->grid.bounds();
onChangeRectangle(defBounds);
partialTiles()->setSelected(m_docPref->importSpriteSheet.partialTiles()); partialTiles()->setSelected(m_docPref->importSpriteSheet.partialTiles());
onEntriesChange(); onEntriesChange();
} }