Fix merging of two shape layers (also after scaling)
f2ad5ab4cadf
Actions

Authored by dkazakov on Feb 5 2018, 9:33 PM.

Description

Fix merging of two shape layers (also after scaling)

Implement correct reordering of the shapes according to zIndex (see KoShapeReorderCommand::mergeDownShapes()). Added homogenizeZIndexes() function, that can be reused in other cases for linearizing the indexes

KisShapeLayer should be linked to its own KoShapeManager, otherwise transformations of the layer will not issue updates.

KisShapeLayerCanvas::updateCanvas() should use toAlignedRect() to handle antialiasing correctly.

The patch also adds a unittest for checking all these bugs :)

BUG:389905

Committed

dkazakov

Feb 5 2018, 9:34 PM

Parents

R37:53c9df77eb55: Fix missing brush tip.

Branches

Unknown

Tags

Unknown

		Path
M		libs/flake/commands/KoShapeReorderCommand.cpp
M		libs/flake/commands/KoShapeReorderCommand.h
M		libs/flake/commands/KoShapeShadowCommand.cpp
M		libs/image/tests/kis_image_test.cpp
M		libs/image/tests/kis_transform_mask_test.cpp
M		libs/ui/flake/kis_shape_layer.cc
M		libs/ui/flake/kis_shape_layer_canvas.cpp
M		libs/ui/tests/CMakeLists.txt
A	(dir)	libs/ui/tests/data/shape_layer_test/
A		libs/ui/tests/data/shape_layer_test/merge_down_00_initial_layer_update.png
A		libs/ui/tests/data/shape_layer_test/merge_down_02_after_merge_down.png
A		libs/ui/tests/data/shape_layer_test/scale_and_merge_down_00_initial_layer_update.png
A		libs/ui/tests/data/shape_layer_test/scale_and_merge_down_01_after_scale_down.png
A		libs/ui/tests/data/shape_layer_test/scale_and_merge_down_02_after_merge_down.png
M		libs/ui/tests/kis_file_layer_test.cpp
M		libs/ui/tests/kis_node_juggler_compressed_test.cpp
M		libs/ui/tests/kis_shape_commands_test.cpp
A		libs/ui/tests/kis_shape_layer_test.cpp
P		libs/ui/tests/kis_shape_layer_test.h Copied from libs/widgets/tests/zoomcontroller_test.h
M		plugins/impex/libkra/tests/kis_kra_saver_test.cpp
M		sdk/tests/testutil.h