bandaid fix layer picker 💀💀

counter185 · Jun 15, 2024 · a8a5aa7 · a8a5aa7
1 parent 5afc428
commit a8a5aa7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/freesprite/EditorLayerPicker.cpp b/freesprite/EditorLayerPicker.cpp
@@ -65,7 +65,8 @@ EditorLayerPicker::~EditorLayerPicker()
 
 bool EditorLayerPicker::isMouseIn(XY thisPositionOnScreen, XY mousePos)
 {
-	return pointInBox(mousePos, SDL_Rect{ thisPositionOnScreen.x, thisPositionOnScreen.y, wxWidth, wxHeight });
+	return pointInBox(mousePos, SDL_Rect{ thisPositionOnScreen.x, thisPositionOnScreen.y, wxWidth, wxHeight })
+        || layerButtons.mouseInAny(thisPositionOnScreen, mousePos);
 }
 
 void EditorLayerPicker::render(XY position)

diff --git a/freesprite/FileIO.cpp b/freesprite/FileIO.cpp
@@ -1383,6 +1383,7 @@ MainEditor* readVOIDSN(PlatformNativePathString path)
                         for (int x = 0; x < nlayers && x < layerVisibilityData.size(); x++) {
                             ret->layers[x]->hidden = layerVisibilityData[x] == '0';
                         }
+                        ret->layerPicker->updateLayers();
                     }
                     if (extData.contains("comments")) {
                         std::string commentsData = extData["comments"];