mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-01-04 08:46:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Best Fit option when Extrude option is checked

Browse Source
This commit is contained in:
David Capello 2019-01-25 15:57:40 -03:00
parent 9a0b0140bf
commit 86464bc63c
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/app/commands/cmd_export_sprite_sheet.cpp
View File

@ -403,6 +403,10 @@ public:
return extrudeEnabled()->isSelected();
}
bool extrudePadding() const {
return (extrudeValue() ? 1: 0);
}
bool openGeneratedValue() const {
return openGenerated()->isSelected();
}
@ -588,7 +592,8 @@ private:
Fit fit;
if (bestFit()->isSelected()) {
fit = best_fit(m_sprite, nframes,
borderPaddingValue(), shapePaddingValue(), innerPaddingValue());
borderPaddingValue(), shapePaddingValue(),
innerPaddingValue() + extrudePadding());
}
else {
fit = calculate_sheet_size(
@ -735,6 +740,7 @@ void ExportSpriteSheetCommand::onExecute(Context* context)
const int innerPadding = base::clamp(params.innerPadding(), 0, 100);
const bool trimCels = params.trim();
const bool extrude = params.extrude();
const int extrudePadding = (extrude ? 1: 0);
const bool listLayers = params.listLayers();
const bool listTags = params.listTags();
const bool listSlices = params.listSlices();
@ -771,7 +777,8 @@ void ExportSpriteSheetCommand::onExecute(Context* context)
}
if (bestFit) {
Fit fit = best_fit(sprite, nframes, borderPadding, shapePadding, innerPadding);
Fit fit = best_fit(sprite, nframes, borderPadding, shapePadding,
innerPadding + extrudePadding);
columns = fit.columns;
rows = fit.rows;
width = fit.width;