Commit a12c5904 authored by Thorsten Zachmann's avatar Thorsten Zachmann

Revert "One more try to fix shape-sorting."

This reverts commit c1bd38582fdcaa961a45de335765ce54f0a3c350.
parent af3d329d
......@@ -874,7 +874,7 @@ void KoShape::setTextRunAroundSide(TextRunAroundSide side, Through runThrought)
if (runThrought == Background) {
setRunThrough(-1);
} else {
setRunThrough(0); // run-through=Foreground is the default
setRunThrough(1);
}
} else {
setRunThrough(0);
......
......@@ -91,8 +91,8 @@ void TestShapeReorderCommand::testRunThroughSorting()
QCOMPARE(shapes.indexOf(&shape1), 2);
QCOMPARE(shapes.indexOf(&shape2), 0);
QCOMPARE(shapes.indexOf(&shape3), 3);
QCOMPARE(shapes.indexOf(&shape4), 4);
QCOMPARE(shapes.indexOf(&shape3), 4);
QCOMPARE(shapes.indexOf(&shape4), 3);
QCOMPARE(shapes.indexOf(&shape5), 1);
}
......@@ -144,17 +144,17 @@ void TestShapeReorderCommand::testParentChildSorting()
qSort(shapes.begin(), shapes.end(), KoShape::compareShapeZIndex);
QCOMPARE(shapes.indexOf(&shape1), 2);
QCOMPARE(shapes.indexOf(&shape2), 0);
QCOMPARE(shapes.indexOf(&shape3), 7);
QCOMPARE(shapes.indexOf(&shape4), 6);
QCOMPARE(shapes.indexOf(&shape5), 5);
QCOMPARE(shapes.indexOf(&shape6), 8);
QCOMPARE(shapes.indexOf(&shape7), 9);
QCOMPARE(shapes.indexOf(&container1), 1);
QCOMPARE(shapes.indexOf(&container2), 4);
QCOMPARE(shapes.indexOf(&container3), 3);
QCOMPARE(shapes.indexOf(&shape1), 3);
QCOMPARE(shapes.indexOf(&shape2), 2);
QCOMPARE(shapes.indexOf(&shape3), 9);
QCOMPARE(shapes.indexOf(&shape4), 7);
QCOMPARE(shapes.indexOf(&shape5), 6);
QCOMPARE(shapes.indexOf(&shape6), 0);
QCOMPARE(shapes.indexOf(&shape7), 1);
QCOMPARE(shapes.indexOf(&container1), 8);
QCOMPARE(shapes.indexOf(&container2), 5);
QCOMPARE(shapes.indexOf(&container3), 4);
}
void TestShapeReorderCommand::testBringToFront()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment