fix #637: Ignore invisible text bubbles when changing layer

Resolves: #637

Author: adazem009

src/engine/internal/engine.cpp

@@ -1324,16 +1324,26 @@ void Engine::moveDrawableForwardLayers(Drawable *drawable, int layers)
     if (it == m_sortedDrawables.end())
         return;
 
-    auto target = it + layers;
+    auto target = it;
+    int layersAbs = std::abs(layers);
 
-    if (target <= m_sortedDrawables.begin()) {
-        moveDrawableToBack(drawable);
-        return;
-    }
+    for (int i = 0; i < layersAbs; i++) {
+        if (target <= m_sortedDrawables.begin()) {
+            moveDrawableToBack(drawable);
+            return;
+        }
 
-    if (target >= m_sortedDrawables.end()) {
-        moveDrawableToFront(drawable);
-        return;
+        if (target >= m_sortedDrawables.end()) {
+            moveDrawableToFront(drawable);
+            return;
+        }
+
+        Drawable *currentDrawable;
+
+        do {
+            currentDrawable = *target;
+            target += layers / layersAbs;
+        } while (currentDrawable->isTextBubble() && static_cast<TextBubble *>(currentDrawable)->text().empty());
     }
 
     if (layers > 0)

test/engine/engine_test.cpp

@@ -1362,6 +1362,11 @@ TEST(EngineTest, MoveDrawableForwardLayers)
     std::vector<Sprite *> sprites;
     createTargets(&engine, sprites);
 
+    const auto &targets = engine.targets();
+
+    for (auto target : targets)
+        target->bubble()->setText("test");
+
     engine.moveDrawableForwardLayers(sprites[4], 2);
     ASSERT_EQ(sprites[0]->layerOrder(), 1);
     ASSERT_EQ(sprites[1]->layerOrder(), 5);
@@ -1421,6 +1426,20 @@ TEST(EngineTest, MoveDrawableForwardLayers)
     ASSERT_EQ(sprites[2]->bubble()->layerOrder(), 8);
     ASSERT_EQ(sprites[3]->bubble()->layerOrder(), 9);
     ASSERT_EQ(sprites[4]->bubble()->layerOrder(), 11);
+
+    sprites[1]->bubble()->setText("");
+    sprites[3]->bubble()->setText("");
+    engine.moveDrawableForwardLayers(sprites[2], 8);
+    ASSERT_EQ(sprites[0]->layerOrder(), 1);
+    ASSERT_EQ(sprites[1]->layerOrder(), 4);
+    ASSERT_EQ(sprites[2]->layerOrder(), 11);
+    ASSERT_EQ(sprites[3]->layerOrder(), 3);
+    ASSERT_EQ(sprites[4]->layerOrder(), 2);
+    ASSERT_EQ(sprites[0]->bubble()->layerOrder(), 9);
+    ASSERT_EQ(sprites[1]->bubble()->layerOrder(), 6);
+    ASSERT_EQ(sprites[2]->bubble()->layerOrder(), 7);
+    ASSERT_EQ(sprites[3]->bubble()->layerOrder(), 8);
+    ASSERT_EQ(sprites[4]->bubble()->layerOrder(), 10);
 }
 
 TEST(EngineTest, MoveDrawableBackwardLayers)
@@ -1429,6 +1448,11 @@ TEST(EngineTest, MoveDrawableBackwardLayers)
     std::vector<Sprite *> sprites;
     createTargets(&engine, sprites);
 
+    const auto &targets = engine.targets();
+
+    for (auto target : targets)
+        target->bubble()->setText("test");
+
     engine.moveDrawableBackwardLayers(sprites[4], -2);
     ASSERT_EQ(sprites[0]->layerOrder(), 1);
     ASSERT_EQ(sprites[1]->layerOrder(), 5);
@@ -1488,6 +1512,20 @@ TEST(EngineTest, MoveDrawableBackwardLayers)
     ASSERT_EQ(sprites[2]->bubble()->layerOrder(), 8);
     ASSERT_EQ(sprites[3]->bubble()->layerOrder(), 9);
     ASSERT_EQ(sprites[4]->bubble()->layerOrder(), 11);
+
+    sprites[1]->bubble()->setText("");
+    sprites[3]->bubble()->setText("");
+    engine.moveDrawableBackwardLayers(sprites[2], -8);
+    ASSERT_EQ(sprites[0]->layerOrder(), 1);
+    ASSERT_EQ(sprites[1]->layerOrder(), 4);
+    ASSERT_EQ(sprites[2]->layerOrder(), 11);
+    ASSERT_EQ(sprites[3]->layerOrder(), 3);
+    ASSERT_EQ(sprites[4]->layerOrder(), 2);
+    ASSERT_EQ(sprites[0]->bubble()->layerOrder(), 9);
+    ASSERT_EQ(sprites[1]->bubble()->layerOrder(), 6);
+    ASSERT_EQ(sprites[2]->bubble()->layerOrder(), 7);
+    ASSERT_EQ(sprites[3]->bubble()->layerOrder(), 8);
+    ASSERT_EQ(sprites[4]->bubble()->layerOrder(), 10);
 }
 
 TEST(EngineTest, MoveDrawableBehindOther)