svghmi/detachable_pages.ysl2
branchsvghmi
changeset 3005 ff9ae4f4e3be
parent 2955 64e603b84aa3
child 3007 360300a8b995
--- a/svghmi/detachable_pages.ysl2	Tue Aug 04 11:53:39 2020 +0200
+++ b/svghmi/detachable_pages.ysl2	Wed Aug 05 18:49:29 2020 +0200
@@ -138,14 +138,14 @@
             warning > Page id="«$page/@id»" : No match for path "«$desc/path/@value»" in HMI tree
     |     page_index: «$desc/path/@index»,
     }
-    |     relative_widgets: [
-    foreach "$page_relative_widgets" {
-    |         hmi_widgets["«@id»"]`if "position()!=last()" > ,`
-    }
-    |     ],
-    |     absolute_widgets: [
-    foreach "$page_managed_widgets[not(@id = $page_relative_widgets/@id)]" {
-    |         hmi_widgets["«@id»"]`if "position()!=last()" > ,`
+    |     widgets: [
+    foreach "$page_managed_widgets" {
+        const "widget_paths_relativeness" 
+            foreach "func:widget(@id)/path" {
+                value "func:is_descendant_path(@value, $desc/path/@value)";
+                if "position()!=last()" > ,
+            }
+    |         [hmi_widgets["«@id»"], [«$widget_paths_relativeness»]]`if "position()!=last()" > ,`
     }
     |     ],
     |     jumps: [