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

Merge branch 'rect-pack-padding' of https://github.com/kawa-yoiko/aseprite into master

Browse Source
This commit is contained in:
David Capello 2019-04-01 10:06:03 -03:00
commit 686da0efd8
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
laf

@ -1 +1 @@
Subproject commit 128884b15d770b1a400c5d98707efe6bc8351793
Subproject commit ffebad9a05b6d2f0b17353249e067c359cd97676

4
src/app/doc_exporter.cpp
View File

@ -356,9 +356,7 @@ class DocExporter::BestFitLayoutSamples :
public DocExporter::LayoutSamples {
public:
void layoutSamples(Samples& samples, int borderPadding, int shapePadding, int& width, int& height) override {
gfx::PackingRects pr;
// TODO Add support for shape paddings
gfx::PackingRects pr(borderPadding, shapePadding);
for (auto& sample : samples) {
if (sample.isDuplicated() ||