philipp/KDDockWidgets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Layouting engine rewrite

Browse Source 
The layouting was becoming too complex to maintain and to introduce
new features. Was even buggy, the fuzzer was constantly finding
bugs, which took hours to workaround.

Problem with the old layout engine is that there was a catch 22, between
Items driving the separators, and separators driving the anchors.

The new layout is much simpler, both in implementation and conceptually.
There's simply a recursive hierarchy of Item elements. An Item can either
have a QWidget to show, or be a ItemContainer, which contains Item children,
and so forth. Each ItemContainer is either vertical or horizontal. That's enough
to represent the "nested multi-splitter" concept which KDDW uses.

After each item insertion/deletion/resize, the separators are regenerated. They
are essentially dumb now.

TODO:
- Separators are drawn, but are not interactive yet
- There's 5 tests failing
- LayoutSaver scalling functionality
This commit is contained in:
Sergio Martins
2020-05-03 16:06:54 +01:00
parent 86d1a52bbf
commit 97c1ca30fd
47 changed files with 4966 additions and 6033 deletions
Download Patch File Download Diff File Expand all files Collapse all files

905
tests/fuzzer/testcases/18.json Normal file
View File

@@ -0,0 +1,905 @@
{
"initialLayout": {
"dockWidgets": [
{
"geometry": {
"size": {
"height": 496,
"width": 260
},
"x": 213,
"y": 149
},
"isFloating": false,
"isVisible": false,
"minSize": {
"height": 324,
"width": 183
},
"name": "DockWidget-1"
},
{
"geometry": {
"size": {
"height": 784,
"width": 342
},
"x": 42,
"y": 428
},
"isFloating": false,
"isVisible": false,
"minSize": {
"height": 247,
"width": 247
},
"name": "DockWidget-2"
},
{
"geometry": {
"size": {
"height": 789,
"width": 566
},
"x": 294,
"y": 396
},
"isFloating": true,
"isVisible": false,
"minSize": {
"height": 502,
"width": 345
},
"name": "DockWidget-3"
},
{
"geometry": {
"size": {
"height": 948,
"width": 440
},
"x": 461,
"y": 56
},
"isFloating": false,
"isVisible": true,
"minSize": {
"height": 568,
"width": 246
},
"name": "DockWidget-4"
},
{
"geometry": {
"size": {
"height": 642,
"width": 529
},
"x": 172,
"y": 192
},
"isFloating": true,
"isVisible": false,
"minSize": {
"height": 213,
"width": 268
},
"name": "DockWidget-5"
},
{
"geometry": {
"size": {
"height": 1089,
"width": 305
},
"x": 212,
"y": 8
},
"isFloating": true,
"isVisible": true,
"minSize": {
"height": 567,
"width": 165
},
"name": "DockWidget-6"
},
{
"geometry": {
"size": {
"height": 632,
"width": 892
},
"x": 477,
"y": 51
},
"isFloating": false,
"isVisible": false,
"minSize": {
"height": 329,
"width": 407
},
"name": "DockWidget-7"
},
{
"geometry": {
"size": {
"height": 653,
"width": 665
},
"x": 228,
"y": 458
},
"isFloating": false,
"isVisible": true,
"minSize": {
"height": 440,
"width": 371
},
"name": "DockWidget-8"
},
{
"geometry": {
"size": {
"height": 612,
"width": 560
},
"x": 371,
"y": 63
},
"isFloating": false,
"isVisible": false,
"minSize": {
"height": 534,
"width": 300
},
"name": "DockWidget-9"
}
],
"mainWindows": [
{
"geometry": {
"size": {
"height": 1199,
"width": 305
},
"x": 180,
"y": 209
},
"mainWindowOption": 0,
"name": "MainWindow-1"
}
]
},
"operations": [
{
"comment": "AddDockWidget DockWidget-5-[hidden] to top",
"params": {
"addingOption": 0,
"dockWidgetName": "DockWidget-5",
"location": 2,
"mainWindowName": "MainWindow-1"
},
"type": 4
},
{
"comment": "AddDockWidget DockWidget-4 to right",
"params": {
"addingOption": 0,
"dockWidgetName": "DockWidget-4",
"location": 3,
"mainWindowName": "MainWindow-1"
},
"type": 4
},
{
"comment": "AddDockWidgetAsTab DockWidget-5 onto DockWidget-8",
"params": {
"dockWidgetName": "DockWidget-8",
"dockWidgetToAddName": "DockWidget-5"
},
"type": 5
},
{
"comment": "AddDockWidget DockWidget-6 to top, relative to DockWidget-4",
"params": {
"addingOption": 0,
"dockWidgetName": "DockWidget-6",
"location": 2,
"mainWindowName": "MainWindow-1",
"relativeToName": "DockWidget-4"
},
"type": 4
},
{
"comment": "AddDockWidgetAsTab DockWidget-1-[hidden] onto DockWidget-7",
"params": {
"dockWidgetName": "DockWidget-7",
"dockWidgetToAddName": "DockWidget-1"
},
"type": 5
},
{
"comment": "Hidding DockWidget-4",
"params": {
"dockWidgetName": "DockWidget-4"
},
"type": 2
},
{
"comment": "AddDockWidget DockWidget-2-[hidden] to left, relative to DockWidget-6",
"params": {
"addingOption": 0,
"dockWidgetName": "DockWidget-2",
"location": 1,
"mainWindowName": "MainWindow-1",
"relativeToName": "DockWidget-6"
},
"type": 4
},
{
"comment": "Closing DockWidget-6",
"params": {
"dockWidgetName": "DockWidget-6"
},
"type": 1
},
{
"comment": "Closing DockWidget-2",
"params": {
"dockWidgetName": "DockWidget-2"
},
"type": 1
},
{
"comment": "Showing DockWidget-4-[hidden]",
"params": {
"dockWidgetName": "DockWidget-4"
},
"type": 3
},
{
"comment": "AddDockWidget DockWidget-7-[hidden] to right, relative to DockWidget-4",
"params": {
"addingOption": 0,
"dockWidgetName": "DockWidget-7",
"location": 3,
"mainWindowName": "MainWindow-1",
"relativeToName": "DockWidget-4"
},
"type": 4
},
{
"comment": "Closing DockWidget-1",
"params": {
"dockWidgetName": "DockWidget-1"
},
"type": 1
},
{
"comment": "AddDockWidget DockWidget-6-[hidden] to right",
"params": {
"addingOption": 0,
"dockWidgetName": "DockWidget-6",
"location": 3,
"mainWindowName": "MainWindow-1"
},
"type": 4
},
{
"comment": "AddDockWidget DockWidget-2 to top",
"params": {
"addingOption": 0,
"dockWidgetName": "DockWidget-2",
"location": 2,
"mainWindowName": "MainWindow-1"
},
"type": 4
},
{
"comment": "Hidding DockWidget-5",
"params": {
"dockWidgetName": "DockWidget-5"
},
"type": 2
},
{
"comment": "Hidding DockWidget-7",
"params": {
"dockWidgetName": "DockWidget-7"
},
"type": 2
},
{
"comment": "Closing DockWidget-8",
"params": {
"dockWidgetName": "DockWidget-8"
},
"type": 1
},
{
"comment": "Closing DockWidget-4",
"params": {
"dockWidgetName": "DockWidget-4"
},
"type": 1
},
{
"comment": "AddDockWidgetAsTab DockWidget-7-[hidden] onto DockWidget-2",
"params": {
"dockWidgetName": "DockWidget-2",
"dockWidgetToAddName": "DockWidget-7"
},
"type": 5
},
{
"comment": "AddDockWidget DockWidget-3-[hidden] to left",
"params": {
"addingOption": 0,
"dockWidgetName": "DockWidget-3",
"location": 1,
"mainWindowName": "MainWindow-1"
},
"type": 4
},
{
"comment": "Closing DockWidget-3",
"params": {
"dockWidgetName": "DockWidget-3"
},
"type": 1
},
{
"comment": "Showing DockWidget-4-[hidden]",
"params": {
"dockWidgetName": "DockWidget-4"
},
"type": 3
},
{
"comment": "AddDockWidget DockWidget-9-[hidden] to left, relative to DockWidget-6",
"params": {
"addingOption": 0,
"dockWidgetName": "DockWidget-9",
"location": 1,
"mainWindowName": "MainWindow-1",
"relativeToName": "DockWidget-6"
},
"type": 4
},
{
"comment": "Hidding DockWidget-9",
"params": {
"dockWidgetName": "DockWidget-9"
},
"type": 2
},
{
"comment": "AddDockWidgetAsTab DockWidget-5-[hidden] onto DockWidget-6",
"params": {
"dockWidgetName": "DockWidget-6",
"dockWidgetToAddName": "DockWidget-5"
},
"type": 5
},
{
"comment": "AddDockWidget DockWidget-5 to right, relative to DockWidget-6-[hidden]",
"params": {
"addingOption": 0,
"dockWidgetName": "DockWidget-5",
"location": 3,
"mainWindowName": "MainWindow-1",
"relativeToName": "DockWidget-6"
},
"type": 4
},
{
"comment": "Showing DockWidget-1-[hidden]",
"params": {
"dockWidgetName": "DockWidget-1"
},
"type": 3
},
{
"comment": "Showing DockWidget-2-[hidden]",
"params": {
"dockWidgetName": "DockWidget-2"
},
"type": 3
},
{
"comment": "Closing DockWidget-4",
"params": {
"dockWidgetName": "DockWidget-4"
},
"type": 1
},
{
"comment": "Showing DockWidget-9-[hidden]",
"params": {
"dockWidgetName": "DockWidget-9"
},
"type": 3
},
{
"comment": "AddDockWidget DockWidget-4-[hidden] to right, relative to DockWidget-2",
"params": {
"addingOption": 0,
"dockWidgetName": "DockWidget-4",
"location": 3,
"mainWindowName": "MainWindow-1",
"relativeToName": "DockWidget-2"
},
"type": 4
},
{
"comment": "Showing DockWidget-3-[hidden]",
"params": {
"dockWidgetName": "DockWidget-3"
},
"type": 3
},
{
"comment": "AddDockWidgetAsTab DockWidget-1 onto DockWidget-5",
"params": {
"dockWidgetName": "DockWidget-5",
"dockWidgetToAddName": "DockWidget-1"
},
"type": 5
},
{
"comment": "Showing DockWidget-5-[hidden]",
"params": {
"dockWidgetName": "DockWidget-5"
},
"type": 3
},
{
"comment": "Hidding DockWidget-2",
"params": {
"dockWidgetName": "DockWidget-2"
},
"type": 2
},
{
"comment": "Hidding DockWidget-5",
"params": {
"dockWidgetName": "DockWidget-5"
},
"type": 2
},
{
"comment": "Hidding DockWidget-7",
"params": {
"dockWidgetName": "DockWidget-7"
},
"type": 2
},
{
"comment": "AddDockWidget DockWidget-9 to left",
"params": {
"addingOption": 0,
"dockWidgetName": "DockWidget-9",
"location": 1,
"mainWindowName": "MainWindow-1"
},
"type": 4
},
{
"comment": "AddDockWidget DockWidget-6 to top, relative to DockWidget-4",
"params": {
"addingOption": 0,
"dockWidgetName": "DockWidget-6",
"location": 2,
"mainWindowName": "MainWindow-1",
"relativeToName": "DockWidget-4"
},
"type": 4
},
{
"comment": "Closing DockWidget-3",
"params": {
"dockWidgetName": "DockWidget-3"
},
"type": 1
},
{
"comment": "AddDockWidget DockWidget-3-[hidden] to left, relative to DockWidget-6",
"params": {
"addingOption": 0,
"dockWidgetName": "DockWidget-3",
"location": 1,
"mainWindowName": "MainWindow-1",
"relativeToName": "DockWidget-6"
},
"type": 4
},
{
"comment": "Showing DockWidget-5-[hidden]",
"params": {
"dockWidgetName": "DockWidget-5"
},
"type": 3
},
{
"comment": "AddDockWidget DockWidget-2-[hidden] to bottom",
"params": {
"addingOption": 0,
"dockWidgetName": "DockWidget-2",
"location": 4,
"mainWindowName": "MainWindow-1"
},
"type": 4
},
{
"comment": "AddDockWidget DockWidget-6 to bottom",
"params": {
"addingOption": 0,
"dockWidgetName": "DockWidget-6",
"location": 4,
"mainWindowName": "MainWindow-1"
},
"type": 4
},
{
"comment": "AddDockWidgetAsTab DockWidget-7-[hidden] onto DockWidget-2",
"params": {
"dockWidgetName": "DockWidget-2",
"dockWidgetToAddName": "DockWidget-7"
},
"type": 5
},
{
"comment": "AddDockWidgetAsTab DockWidget-8-[hidden] onto DockWidget-3",
"params": {
"dockWidgetName": "DockWidget-3",
"dockWidgetToAddName": "DockWidget-8"
},
"type": 5
},
{
"comment": "Hidding DockWidget-9",
"params": {
"dockWidgetName": "DockWidget-9"
},
"type": 2
},
{
"comment": "Closing DockWidget-7",
"params": {
"dockWidgetName": "DockWidget-7"
},
"type": 1
},
{
"comment": "Closing DockWidget-4",
"params": {
"dockWidgetName": "DockWidget-4"
},
"type": 1
},
{
"comment": "AddDockWidget DockWidget-1-[hidden] to top",
"params": {
"addingOption": 0,
"dockWidgetName": "DockWidget-1",
"location": 2,
"mainWindowName": "MainWindow-1"
},
"type": 4
},
{
"comment": "Hidding DockWidget-6",
"params": {
"dockWidgetName": "DockWidget-6"
},
"type": 2
},
{
"comment": "AddDockWidgetAsTab DockWidget-6-[hidden] onto DockWidget-8",
"params": {
"dockWidgetName": "DockWidget-8",
"dockWidgetToAddName": "DockWidget-6"
},
"type": 5
},
{
"comment": "AddDockWidget DockWidget-2 to bottom",
"params": {
"addingOption": 0,
"dockWidgetName": "DockWidget-2",
"location": 4,
"mainWindowName": "MainWindow-1"
},
"type": 4
},
{
"comment": "AddDockWidget DockWidget-6 to bottom",
"params": {
"addingOption": 0,
"dockWidgetName": "DockWidget-6",
"location": 4,
"mainWindowName": "MainWindow-1"
},
"type": 4
},
{
"comment": "AddDockWidget DockWidget-5 to left",
"params": {
"addingOption": 0,
"dockWidgetName": "DockWidget-5",
"location": 1,
"mainWindowName": "MainWindow-1"
},
"type": 4
},
{
"comment": "AddDockWidget DockWidget-3-[hidden] to bottom, relative to DockWidget-6",
"params": {
"addingOption": 0,
"dockWidgetName": "DockWidget-3",
"location": 4,
"mainWindowName": "MainWindow-1",
"relativeToName": "DockWidget-6"
},
"type": 4
},
{
"comment": "AddDockWidget DockWidget-3 to right",
"params": {
"addingOption": 0,
"dockWidgetName": "DockWidget-3",
"location": 3,
"mainWindowName": "MainWindow-1"
},
"type": 4
},
{
"comment": "Showing DockWidget-7-[hidden]",
"params": {
"dockWidgetName": "DockWidget-7"
},
"type": 3
},
{
"comment": "Closing DockWidget-1",
"params": {
"dockWidgetName": "DockWidget-1"
},
"type": 1
},
{
"comment": "Hidding DockWidget-8",
"params": {
"dockWidgetName": "DockWidget-8"
},
"type": 2
},
{
"comment": "Hidding DockWidget-2",
"params": {
"dockWidgetName": "DockWidget-2"
},
"type": 2
},
{
"comment": "AddDockWidget DockWidget-9-[hidden] to left",
"params": {
"addingOption": 0,
"dockWidgetName": "DockWidget-9",
"location": 1,
"mainWindowName": "MainWindow-1"
},
"type": 4
},
{
"comment": "AddDockWidget DockWidget-6 to right, relative to DockWidget-5",
"params": {
"addingOption": 0,
"dockWidgetName": "DockWidget-6",
"location": 3,
"mainWindowName": "MainWindow-1",
"relativeToName": "DockWidget-5"
},
"type": 4
},
{
"comment": "AddDockWidgetAsTab DockWidget-1-[hidden] onto DockWidget-3",
"params": {
"dockWidgetName": "DockWidget-3",
"dockWidgetToAddName": "DockWidget-1"
},
"type": 5
},
{
"comment": "AddDockWidget DockWidget-9 to left, relative to DockWidget-3-[hidden]",
"params": {
"addingOption": 0,
"dockWidgetName": "DockWidget-9",
"location": 1,
"mainWindowName": "MainWindow-1",
"relativeToName": "DockWidget-3"
},
"type": 4
},
{
"comment": "AddDockWidget DockWidget-7 to bottom",
"params": {
"addingOption": 0,
"dockWidgetName": "DockWidget-7",
"location": 4,
"mainWindowName": "MainWindow-1"
},
"type": 4
},
{
"comment": "Closing DockWidget-6",
"params": {
"dockWidgetName": "DockWidget-6"
},
"type": 1
},
{
"comment": "AddDockWidget DockWidget-9 to top",
"params": {
"addingOption": 0,
"dockWidgetName": "DockWidget-9",
"location": 2,
"mainWindowName": "MainWindow-1"
},
"type": 4
},
{
"comment": "AddDockWidget DockWidget-1 to bottom",
"params": {
"addingOption": 0,
"dockWidgetName": "DockWidget-1",
"location": 4,
"mainWindowName": "MainWindow-1"
},
"type": 4
},
{
"comment": "AddDockWidget DockWidget-6-[hidden] to right",
"params": {
"addingOption": 0,
"dockWidgetName": "DockWidget-6",
"location": 3,
"mainWindowName": "MainWindow-1"
},
"type": 4
},
{
"comment": "Hidding DockWidget-6",
"params": {
"dockWidgetName": "DockWidget-6"
},
"type": 2
},
{
"comment": "Closing DockWidget-5",
"params": {
"dockWidgetName": "DockWidget-5"
},
"type": 1
},
{
"comment": "Showing DockWidget-8-[hidden]",
"params": {
"dockWidgetName": "DockWidget-8"
},
"type": 3
},
{
"comment": "Closing DockWidget-3",
"params": {
"dockWidgetName": "DockWidget-3"
},
"type": 1
},
{
"comment": "Hidding DockWidget-1",
"params": {
"dockWidgetName": "DockWidget-1"
},
"type": 2
},
{
"comment": "AddDockWidget DockWidget-8 to bottom",
"params": {
"addingOption": 0,
"dockWidgetName": "DockWidget-8",
"location": 4,
"mainWindowName": "MainWindow-1"
},
"type": 4
},
{
"comment": "Closing DockWidget-9",
"params": {
"dockWidgetName": "DockWidget-9"
},
"type": 1
},
{
"comment": "AddDockWidget DockWidget-8-[hidden] to top, relative to DockWidget-7",
"params": {
"addingOption": 0,
"dockWidgetName": "DockWidget-8",
"location": 2,
"mainWindowName": "MainWindow-1",
"relativeToName": "DockWidget-7"
},
"type": 4
},
{
"comment": "Showing DockWidget-6-[hidden]",
"params": {
"dockWidgetName": "DockWidget-6"
},
"type": 3
},
{
"comment": "Closing DockWidget-8",
"params": {
"dockWidgetName": "DockWidget-8"
},
"type": 1
},
{
"comment": "Hidding DockWidget-7",
"params": {
"dockWidgetName": "DockWidget-7"
},
"type": 2
},
{
"comment": "Showing DockWidget-9-[hidden]",
"params": {
"dockWidgetName": "DockWidget-9"
},
"type": 3
},
{
"comment": "AddDockWidget DockWidget-9 to top",
"params": {
"addingOption": 0,
"dockWidgetName": "DockWidget-9",
"location": 2,
"mainWindowName": "MainWindow-1"
},
"type": 4
},
{
"comment": "Hidding DockWidget-9",
"params": {
"dockWidgetName": "DockWidget-9"
},
"type": 2
},
{
"comment": "Showing DockWidget-7-[hidden]",
"params": {
"dockWidgetName": "DockWidget-7"
},
"type": 3
},
{
"comment": "Showing DockWidget-4-[hidden]",
"params": {
"dockWidgetName": "DockWidget-4"
},
"type": 3
},
{
"comment": "Showing DockWidget-9-[hidden]",
"params": {
"dockWidgetName": "DockWidget-9"
},
"type": 3
}
]
}