diff --git a/tests/popover2.ui b/tests/popover2.ui
index 4b85bc35b5..10a2241aba 100644
--- a/tests/popover2.ui
+++ b/tests/popover2.ui
@@ -5,398 +5,446 @@
-
-
-
- True
- top.cut
- Cut
-
-
-
-
- True
- top.copy
- Copy
-
-
-
-
- True
- top.paste
- Paste
-
-
-
-
- True
- horizontal
- 12
- 12
- 3
- 3
-
-
-
-
- True
- action1
- No action
-
-
-
-
- True
- top.action2
- Toggle
-
-
-
-
- True
- top.action2a
- Another Toggle
True
vertical
- 12
- 12
- 6
- 3
+ 10
-
+
True
- start
- Middle Section
-
+ Submenu 1
+ True
+ True
+ main
-
+
+ True
+ vertical
+ 12
+ 12
+ 6
+ 3
+
+
+ True
+ start
+ 5555
+
+
+
+
+
+ True
+ horizontal
+
+
+
+
+
+
+ True
+ top.action5
+ Item 5
+
+
+
+
+ True
+ top.action5
+ Item 5a
+
+
+
+
+ True
+ top.action5
+ Item 5b
+
+
+
+
True
horizontal
-
-
-
-
-
-
- True
- top.action3
- 'three'
- Radio 1
-
-
-
-
- True
- top.action3
- 'four'
- Radio 2
-
-
-
-
- True
- Submenu 1
- submenu1
-
-
-
-
- True
- Submenu 2
- submenu2
-
-
-
-
- True
- vertical
- 12
- 12
- 6
- 3
-
-
- True
- start
- End Section
+ fill
+ 10
+
+
+ True
+ List
+ top.set-view
+ 'list'
+ True
+ True
+ icon-list
+
+
+ True
+
+
+
+
+ True
+ Grid
+ top.set-view
+ 'grid'
+ True
+ True
+ icon-grid
+
+
+ True
+
+
-
+
+ True
+ top.action5
+ Item 5c
+
+
+
+
+ True
+ top.action5
+ Item 5d
+
+
+
+
+ True
+ vertical
+ 12
+ 12
+ 6
+ 3
+
+
+ True
+ start
+ Format
+
+
+
+
+
+ True
+ horizontal
+
+
+
+
+
+
True
horizontal
-
-
-
-
-
-
- True
- top.action9
- Another Item 9
- icon9
-
-
-
-
- True
- top.action10
- Another Item 10
-
-
-
-
- True
- Submenu 1
- True
- True
- main
-
-
- submenu1
-
-
-
-
- True
- vertical
- 12
- 12
- 6
- 3
-
-
- True
- start
- 5555
+ fill
+ 10
+
+
+ True
+ Bold
+ top.bold
+ True
+ True
+
+
+ True
+
+
+
+
+ True
+ Italic
+ top.italic
+ True
+ True
+ icon-italic
+
+
+ True
+
+
+
+
+ True
+ Strikethrough
+ top.strikethrough
+ True
+ True
+ icon-strikethrough
+
+
+ True
+
+
+
+
+ True
+ Underline
+ top.underline
+ True
+ True
+ icon-underline
+
+
+ True
+
+
-
+
True
- horizontal
+ vertical
+ 12
+ 12
+ 6
+ 3
+
+
+ True
+ start
+ 6666
+
+
+
+
+
+ True
+ horizontal
+
+
-
-
- submenu1
-
-
-
-
- True
- top.action5
- Item 5
-
-
- submenu1
-
-
-
-
- True
- top.action5
- Item 5a
-
-
- submenu1
-
-
-
-
- True
- top.action5
- Item 5b
-
-
- submenu1
-
-
-
-
- True
- horizontal
- fill
- 10
-
-
-
- True
- List
- top.set-view
- 'list'
- True
- True
- icon-list
-
-
- True
-
-
True
- Grid
- top.set-view
- 'grid'
- True
- True
- icon-grid
+ top.action6
+ Item 6
-
- True
-
-
-
-
- submenu1
-
-
-
-
- True
- top.action5
- Item 5c
-
-
- submenu1
-
-
-
-
- True
- top.action5
- Item 5d
-
-
- submenu1
-
-
-
-
- True
- vertical
- 12
- 12
- 6
- 3
-
-
- True
- start
- Format
-
-
-
-
-
- True
- horizontal
-
-
-
-
- submenu1
-
-
-
-
- True
- horizontal
- fill
- 10
-
-
-
- True
- Bold
- top.bold
- True
- True
-
-
- True
-
True
- Italic
- top.italic
- True
- True
- icon-italic
+ top.action6
+ Item 6a
-
- True
-
True
- Strikethrough
- top.strikethrough
- True
- True
- icon-strikethrough
+ top.action6
+ Item 6b
-
- True
-
True
- Underline
- top.underline
- True
- True
- icon-underline
+ top.action6
+ Item 6c
+
+
+
+
+ True
+ top.action6
+ Item 6d
-
- True
-
@@ -407,164 +455,81 @@
True
vertical
- 12
- 12
- 6
- 3
+ 10
-
+
True
- start
- 6666
-
+ Submenu 2
+ True
+ True
+ main
-
+
True
- horizontal
+ top.action7
+ Item 7
+
+
+
+
+ True
+ Subsubmenu
+ icon9
+ subsubmenu
-
-
- submenu1
-
-
-
-
- True
- top.action6
- Item 6
-
-
- submenu1
-
-
-
-
- True
- top.action6
- Item 6a
-
-
- submenu1
-
-
-
-
- True
- top.action6
- Item 6b
-
-
- submenu1
-
-
-
-
- True
- top.action6
- Item 6c
-
-
- submenu1
-
-
-
-
- True
- top.action6
- Item 6d
-
-
- submenu1
-
-
-
-
- True
- Submenu 2
- True
- True
- main
submenu2
-
+
True
- top.action7
- Item 7
-
-
- submenu2
-
-
-
-
- True
- Subsubmenu
- icon9
- subsubmenu
-
-
- submenu2
-
-
-
-
- True
- Subsubmenu
- True
- True
- submenu2
-
-
- subsubmenu
-
-
-
-
- True
- action8
- Item 8
-
-
- subsubmenu
-
-
-
-
- True
- horizontal
- 12
- 12
- 3
- 3
-
-
- subsubmenu
-
-
-
-
- True
- top.action9
- Item 9
-
-
- subsubmenu
-
-
-
-
- True
- top.action10
- Item 10
+ vertical
+ 10
+
+
+ True
+ Subsubmenu
+ True
+ True
+ submenu2
+
+
+
+
+ True
+ action8
+ Item 8
+
+
+
+
+ True
+ horizontal
+ 12
+ 12
+ 3
+ 3
+
+
+
+
+ True
+ top.action9
+ Item 9
+
+
+
+
+ True
+ top.action10
+ Item 10
+
+
subsubmenu