rebase on main

GUI/Model/Sample/SampleItem.cpp

@@ -98,12 +98,12 @@ void SampleItem::moveLayer(LayerItem* layer, LayerItem* aboveThisLayer)
     if (layer == aboveThisLayer)
         return;
 
-    int currentIndex = layers().indexOf(layer);
+    int currentIndex = layerItems().indexOf(layer);
     m_layers.release_at(currentIndex);
 
     int destIndex = m_layers.size();
     if (aboveThisLayer != nullptr)
-        destIndex = layers().indexOf(aboveThisLayer);
+        destIndex = layerItems().indexOf(aboveThisLayer);
     m_layers.insert_at(destIndex, layer);
 
     updateTopBottom();