Use layer index to differentiate between layers with the same name

[martincapello]

Fix #2656

[dacap]

It looks like this change 6a748db includes changes to all end of lines (from Unix-like to Windows-like EOL). Could you please fix that?

[dacap]

And then 2229b5b does the reverse (?)

[martincapello]

How about now?

[dacap]

I'll merge the commit with a minor change in the message (adding a missing reference to #2656). And then I'll add some extra changes (because the "- 2" is hard-coded and I would prefer constant defined in layer_frame_comboboxes.h)

[dacap]

Also two things: 1) I have to check if the index is from top to bottom or bottom to top, but maybe 0 should be the background (bottom), and going up from there. 2) from what it looks, if we specified the layerIndex, we have to specify the layer name too in ExportSpriteSheetParams.

I'll try to fix these issues.

[dacap]

@martincapello I have pushed some changes into this branch: https://github.com/dacap/aseprite/tree/fix-export-layers-same-name2 but I'm not going to merge this yet as ExportSpriteSheet doesn't remember the last layer exported correctly (to do so we'd need an extra value in pref.xml:

aseprite/data/pref.xml

Line 514 in 277e24c

<option id="layer" type="std::string" />

)

If you want to continue from fix-export-layers-same-name2 you can do so. We'll merge this for a future version.

[martincapello]

I'll merge the commit with a minor change in the message (adding a missing reference to #2656). And then I'll add some extra changes (because the "- 2" is hard-coded and I would prefer constant defined in layer_frame_comboboxes.h)

Makes sense. Also, do you think we should have a constant for the -1 returned by the layerIndex() functions?

@martincapello I have pushed some changes into this branch: https://github.com/dacap/aseprite/tree/fix-export-layers-same-name2 but I'm not going to merge this yet as ExportSpriteSheet doesn't remember the last layer exported correctly (to do so we'd need an extra value in pref.xml:

I wasn't sure about adding this extra value to pref.xml, I will do it then.

If you want to continue from fix-export-layers-same-name2 you can do so. We'll merge this for a future version.

Okay, I will continue from that branch. Thanks!

[martincapello]

@dacap Just pushed some changes to let the exporting dialogs remember the last selected layer index.

[dacap]

Please check that we are using other format in the pref.xml file:

Suggested change

	<option id="layerIndex" type="int" default ="-1" />
	<option id="layer_index" type="int" default ="-1" />

[martincapello]

I think that this is not the first time I made this mistake...🤦
Will fix it, thanks!

[dacap]

@martincapello just saw a warning (warning: suggest parentheses around ‘&&’ within ‘||’ [-Wparentheses]) about all these conditions, it's already merged but it would be nice to fix it:

      if (layer->name() == layerName && layerIndex == -1 ||
          layer->name() == layerName && layerIndex == i) {

It's equal to:

      if ((layer->name() == layerName) && (layerIndex == -1 || layerIndex == i)) {

The same for the other conditions, must be reviewed (these are 3 times in this PR).