Merge branch 'main' of https://github.com/aseprite/aseprite

RooTender · Jul 5, 2024 · 6e596d1 · 6e596d1
2 parents 8320e2c + 6047ab6
commit 6e596d1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/laf b/laf
diff --git a/src/app/ui/layer_frame_comboboxes.cpp b/src/app/ui/layer_frame_comboboxes.cpp
@@ -84,10 +84,17 @@ void fill_area_combobox(const doc::Sprite* sprite, ui::ComboBox* area, const std
   if (defArea == kSelectedCanvas)
     area->setSelectedItemIndex(i);
 
-  for (auto slice : sprite->slices()) {
+  std::vector<doc::Slice*> sliceList;
+  for (auto* slice : sprite->slices()) {
     if (slice->name().empty())
       continue;
 
+    sliceList.push_back(slice);
+  }
+  std::sort(sliceList.begin(),
+            sliceList.end(),
+            [](doc::Slice* a, doc::Slice* b) { return a->name() < b->name(); });
+  for (auto* slice : sliceList) {
     i = area->addItem(new SliceListItem(slice));
     if (defArea == slice->name())
       area->setSelectedItemIndex(i);
+1 −0		.github/workflows/build.yml
+77 −40		base/fs.cpp
+26 −10		base/fs.h
+131 −24		base/fs_tests.cpp
+16 −2		base/fs_unix.h
+25 −12		base/fs_win32.h
+1 −1		base/mem_utils.cpp
+49 −0		gfx/clip.h
+10 −3		os/x11/window.cpp