Skip to content

Commit 4132056

Browse files
joregjoreg
committed
fix for group widget handling in client
1 parent 358b50e commit 4132056

File tree

2 files changed

+57
-37
lines changed

2 files changed

+57
-37
lines changed

‎VL.IO.RCP.vl

+55-35
Original file line numberDiff line numberDiff line change
@@ -1122,15 +1122,15 @@
11221122
************************ Carrot ************************
11231123
11241124
-->
1125-
<Node Name="Carrot" Bounds="393,223" Id="Q41XIgEmtEFNXWG8RejQQp">
1125+
<Node Name="Carrot" Bounds="140,236" Id="Q41XIgEmtEFNXWG8RejQQp">
11261126
<p:NodeReference>
11271127
<Choice Kind="ContainerDefinition" Name="Process" />
11281128
<FullNameCategoryReference ID="Primitive" />
11291129
</p:NodeReference>
11301130
<Patch Id="TmEblw0ehTVPnTYqnWgQmy">
11311131
<Canvas Id="PNXOBiUINtyQHuv08cBIkR" CanvasType="Group">
11321132
<Pad Id="MGKlEqkI3lvO7qkUfw4h7C" SlotId="FNHTrqSFeT6NB50sHdhDRx" Bounds="512,326" />
1133-
<Node Bounds="290,359,51,26" Id="EU8rWFY0h3rO3Ff3FCiyaY">
1133+
<Node Bounds="290,359,53,26" Id="EU8rWFY0h3rO3Ff3FCiyaY">
11341134
<p:NodeReference LastCategoryFullName="RCP.RCPClient" LastDependency="RCPSharp.dll">
11351135
<Choice Kind="NodeFlag" Name="Node" Fixed="true" />
11361136
<Choice Kind="OperationCallFlag" Name="Dispose" />
@@ -1164,7 +1164,7 @@
11641164
</Node>
11651165
<Pad Id="O6NSGpDlEYAQHAbZi6oqZh" SlotId="ChT9Tecd4ZFLSnYS7A1BVL" Bounds="605,206" />
11661166
<ControlPoint Id="KoAzq9V8KiOPi6h20iFDBL" Bounds="784,263" />
1167-
<Node Bounds="108,500,86,26" Id="PRznpHPMdzOPKcPKyLu5sc">
1167+
<Node Bounds="108,500,91,26" Id="PRznpHPMdzOPKcPKyLu5sc">
11681168
<p:NodeReference LastCategoryFullName="RCP.ClientServerBase" LastDependency="RCPSharp.dll">
11691169
<Choice Kind="NodeFlag" Name="Node" Fixed="true" />
11701170
<Choice Kind="OperationCallFlag" Name="ParameterAdded" />
@@ -1203,7 +1203,7 @@
12031203
</Node>
12041204
</Patch>
12051205
</Node>
1206-
<Node Bounds="287,505,98,26" Id="LjyILxgAyQFPvUn7EZ8SXO">
1206+
<Node Bounds="287,505,104,26" Id="LjyILxgAyQFPvUn7EZ8SXO">
12071207
<p:NodeReference LastCategoryFullName="RCP.ClientServerBase" LastDependency="RCPSharp.dll">
12081208
<Choice Kind="NodeFlag" Name="Node" Fixed="true" />
12091209
<Choice Kind="OperationCallFlag" Name="ParameterRemoved" />
@@ -1482,7 +1482,7 @@
14821482
<Pin Id="IvnxfVlCyXMPUQRmnpIr2E" Name="Input 2" Kind="InputPin" />
14831483
<Pin Id="FzgTVcdlob3NI2NmIC3dUs" Name="Output" Kind="StateOutputPin" />
14841484
</Node>
1485-
<Node Bounds="23,937,112,90" Id="AzhQs3mTcYZN1S0reVP8H0">
1485+
<Node Bounds="23,937,122,90" Id="AzhQs3mTcYZN1S0reVP8H0">
14861486
<p:NodeReference LastCategoryFullName="Reactive" LastDependency="VL.CoreLib.vl">
14871487
<Choice Kind="ProcessAppFlag" Name="ForEach" />
14881488
<CategoryReference Kind="Category" Name="Reactive" NeedsToBeDirectParent="true" />
@@ -1512,7 +1512,7 @@
15121512
</Node>
15131513
</Patch>
15141514
</Node>
1515-
<Node Bounds="218,940,112,88" Id="QYS8ZekqmJLNckJEpoRKRY">
1515+
<Node Bounds="218,940,122,88" Id="QYS8ZekqmJLNckJEpoRKRY">
15161516
<p:NodeReference LastCategoryFullName="Reactive" LastDependency="VL.CoreLib.vl">
15171517
<Choice Kind="ProcessAppFlag" Name="ForEach" />
15181518
<CategoryReference Kind="Category" Name="Reactive" NeedsToBeDirectParent="true" />
@@ -1691,13 +1691,13 @@
16911691
************************ GetUniqueRCPId ************************
16921692
16931693
-->
1694-
<Node Name="GetUniqueRCPId" Bounds="394,304,278,300" Id="RCkEVqpsYC8MbgjEVhMEw2">
1694+
<Node Name="GetUniqueRCPId" Bounds="141,317,278,300" Id="RCkEVqpsYC8MbgjEVhMEw2">
16951695
<p:NodeReference LastCategoryFullName="Primitive" LastDependency="builtin">
16961696
<Choice Kind="OperationDefinition" Name="Operation" />
16971697
<CategoryReference Kind="Category" Name="Primitive" NeedsToBeDirectParent="true" />
16981698
</p:NodeReference>
16991699
<Patch Id="OhE5ofXSrhXNLCLs84FUFQ">
1700-
<Node Bounds="531,337,63,26" Id="JuKZ5oZUjlRO5UsfQW3kXc">
1700+
<Node Bounds="278,350,63,26" Id="JuKZ5oZUjlRO5UsfQW3kXc">
17011701
<p:NodeReference LastCategoryFullName="System.Reflection.NodeContext" LastDependency="VL.CoreLib.vl">
17021702
<Choice Kind="NodeFlag" Name="Node" Fixed="true" />
17031703
<CategoryReference Kind="RecordType" Name="NodeContext" />
@@ -1706,7 +1706,7 @@
17061706
<Pin Id="JPnI01rCa9XLvVmAy5sXlr" Name="Input" Kind="StateInputPin" />
17071707
<Pin Id="D9wMF9EVrzQNrKJr3BW7Ej" Name="Path" Kind="OutputPin" />
17081708
</Node>
1709-
<Node Bounds="531,380,55,26" Id="Kar8tHAXuo8O5lEeIVXYkI">
1709+
<Node Bounds="278,393,55,26" Id="Kar8tHAXuo8O5lEeIVXYkI">
17101710
<p:NodeReference LastCategoryFullName="System.Reflection.NodePath" LastDependency="VL.CoreLib.vl">
17111711
<Choice Kind="NodeFlag" Name="Node" Fixed="true" />
17121712
<CategoryReference Kind="ClassType" Name="NodePath" />
@@ -1716,7 +1716,7 @@
17161716
<Pin Id="IwJq0XWIrWFNpXrvV1Fd46" Name="Output" Kind="StateOutputPin" />
17171717
<Pin Id="Nkyu1FtDz6VLw1mTcWHKKC" Name="Result" Kind="OutputPin" />
17181718
</Node>
1719-
<Node Bounds="506,450,80,26" Id="R9IlTyabLaBLjIKP8R2NBQ">
1719+
<Node Bounds="253,463,80,26" Id="R9IlTyabLaBLjIKP8R2NBQ">
17201720
<p:NodeReference LastCategoryFullName="System.Security.Cryptography.HashAlgorithm" LastDependency="System.Security.Cryptography.Primitives.dll">
17211721
<Choice Kind="NodeFlag" Name="Node" Fixed="true" />
17221722
<Choice Kind="OperationCallFlag" Name="ComputeHash" />
@@ -1727,7 +1727,7 @@
17271727
<Pin Id="SjbSsojHunqPbZ4cXDjIF4" Name="Output" Kind="StateOutputPin" />
17281728
<Pin Id="MwNwR4s4PsdLc2sOxEiGbR" Name="Result" Kind="OutputPin" />
17291729
</Node>
1730-
<Node Bounds="408,399,46,19" Id="ErY61sVUTOtPJYWqgRRDuA">
1730+
<Node Bounds="155,412,46,19" Id="ErY61sVUTOtPJYWqgRRDuA">
17311731
<p:NodeReference LastCategoryFullName="System.Security.Cryptography.HashAlgorithm" LastDependency="System.Security.Cryptography.Primitives.dll">
17321732
<Choice Kind="NodeFlag" Name="Node" Fixed="true" />
17331733
<Choice Kind="OperationCallFlag" Name="Create" />
@@ -1737,12 +1737,12 @@
17371737
<Pin Id="R96yolcVQOxNxyB3LUY0oZ" Name="Hash Name" Kind="InputPin" />
17381738
<Pin Id="EoSGPFwqQ2hLdPPDkWY9N9" Name="Result" Kind="OutputPin" />
17391739
</Node>
1740-
<Pad Id="Tt2KGeIocUHOPKfWZHQ84l" Comment="Hash Name" Bounds="410,369,35,15" ShowValueBox="true" isIOBox="true" Value="MD5">
1740+
<Pad Id="Tt2KGeIocUHOPKfWZHQ84l" Comment="Hash Name" Bounds="157,382,35,15" ShowValueBox="true" isIOBox="true" Value="MD5">
17411741
<p:TypeAnnotation LastCategoryFullName="Primitive" LastDependency="VL.CoreLib.vl">
17421742
<Choice Kind="TypeFlag" Name="String" />
17431743
</p:TypeAnnotation>
17441744
</Pad>
1745-
<Node Bounds="581,417,52,19" Id="HCNSs8miZQ6MLBVzTTjFmj">
1745+
<Node Bounds="328,430,52,19" Id="HCNSs8miZQ6MLBVzTTjFmj">
17461746
<p:NodeReference LastCategoryFullName="Primitive.String" LastDependency="VL.CoreLib.vl">
17471747
<Choice Kind="NodeFlag" Name="Node" Fixed="true" />
17481748
<Choice Kind="OperationCallFlag" Name="ToBytes" />
@@ -1752,7 +1752,7 @@
17521752
<Pin Id="GvnplxPA5cEPE8oS9gNLwI" Name="Encoding" Kind="InputPin" />
17531753
<Pin Id="Jxc6skpDzvcOjjh0fg8npq" Name="Result" Kind="OutputPin" />
17541754
</Node>
1755-
<Node Bounds="578,544,82,19" Id="KVXgbGnc2H1N03qKnJdDFn">
1755+
<Node Bounds="325,557,82,19" Id="KVXgbGnc2H1N03qKnJdDFn">
17561756
<p:NodeReference LastCategoryFullName="VL.Model.Internal.GUIDEncoders" LastDependency="VL.Lang.dll">
17571757
<Choice Kind="NodeFlag" Name="Node" Fixed="true" />
17581758
<Choice Kind="OperationCallFlag" Name="GuidTobase62" />
@@ -1761,7 +1761,7 @@
17611761
<Pin Id="MmqF8VaRVpHLM7rZZ4ACEn" Name="Guid" Kind="InputPin" />
17621762
<Pin Id="SktP4LUVDnVNAUL8y0dZnq" Name="Result" Kind="OutputPin" />
17631763
</Node>
1764-
<Node Bounds="578,504,63,26" Id="DJ5Y1AGFj20O4odwSO2hHG">
1764+
<Node Bounds="325,517,63,26" Id="DJ5Y1AGFj20O4odwSO2hHG">
17651765
<p:NodeReference LastCategoryFullName="System.GUID" LastDependency="VL.CoreLib.vl">
17661766
<Choice Kind="NodeFlag" Name="Node" Fixed="true" />
17671767
<CategoryReference Kind="RecordType" Name="GUID" />
@@ -1777,11 +1777,11 @@
17771777
<Link Id="TojkvXhHjc1Mp5IIBOi435" Ids="Jxc6skpDzvcOjjh0fg8npq,VDUEmpU9jMjOoy6yW8vj10" />
17781778
<Link Id="Nfizuzbg5xuNmGn6LRLWcH" Ids="MwNwR4s4PsdLc2sOxEiGbR,GHHoSReaAswP8CVUxpQsHy" />
17791779
<Link Id="PKRusID2VF9O36gJ2IKCFY" Ids="BBeD210K4trPpJmzN1V8x4,MmqF8VaRVpHLM7rZZ4ACEn" />
1780-
<ControlPoint Id="QvFbq1vTEvcOBmQw4e9Njv" Bounds="532,322" />
1780+
<ControlPoint Id="QvFbq1vTEvcOBmQw4e9Njv" Bounds="279,335" />
17811781
<Link Id="FoF2MO0QUtQL7PE0QWctZh" Ids="QvFbq1vTEvcOBmQw4e9Njv,JPnI01rCa9XLvVmAy5sXlr" />
17821782
<Pin Id="IXHkHeDLo9QLwZyABUTdrH" Name="Node Context" Kind="InputPin" Bounds="1158,38" />
17831783
<Link Id="SrTWNYzIszGOET6Yx8QtIF" Ids="IXHkHeDLo9QLwZyABUTdrH,QvFbq1vTEvcOBmQw4e9Njv" IsHidden="true" />
1784-
<ControlPoint Id="CsVHHUQhVNOOz7dGTBKiEM" Bounds="581,587" />
1784+
<ControlPoint Id="CsVHHUQhVNOOz7dGTBKiEM" Bounds="328,600" />
17851785
<Link Id="MGRMMCu9ww3QDEzQlvTB24" Ids="SktP4LUVDnVNAUL8y0dZnq,CsVHHUQhVNOOz7dGTBKiEM" />
17861786
<Pin Id="SSnxPfPFUwpNGoevy3CRxB" Name="Result" Kind="OutputPin" Bounds="1211,301" />
17871787
<Link Id="BM8KNWZA1J9QSpJ9nF1eUK" Ids="CsVHHUQhVNOOz7dGTBKiEM,SSnxPfPFUwpNGoevy3CRxB" IsHidden="true" />
@@ -5449,24 +5449,6 @@
54495449
</Node>
54505450
<!--
54515451
5452-
************************ Widget ************************
5453-
5454-
-->
5455-
<Node Name="Widget" Bounds="824,379" Id="QGZWPkoW4iaM4T1OSpwJhZ">
5456-
<p:NodeReference>
5457-
<Choice Kind="ForwardDefinition" Name="Forward" />
5458-
<FullNameCategoryReference ID="Primitive" />
5459-
</p:NodeReference>
5460-
<p:TypeAnnotation LastCategoryFullName="RCP.Protocol" LastDependency="RCPSharp.dll">
5461-
<Choice Kind="TypeFlag" Name="Widget" />
5462-
</p:TypeAnnotation>
5463-
<Patch Id="MsAQdVTI5cQLBh9haj9aYO">
5464-
<Canvas Id="OPnMPlffD2SNgefcJjc1nI" BordersChecked="false" CanvasType="Group" />
5465-
<ProcessDefinition Id="PF2omLMWp7oQDnlHxs3sdU" IsHidden="true" />
5466-
</Patch>
5467-
</Node>
5468-
<!--
5469-
54705452
************************ EnumParameter ************************
54715453
54725454
-->
@@ -6262,6 +6244,44 @@
62626244
</Patch>
62636245
</Patch>
62646246
</Node>
6247+
<Canvas Id="AaMgv88GHFfMbqGdb5o3rg" Name="Widgets" Position="590,329">
6248+
<!--
6249+
6250+
************************ Widget ************************
6251+
6252+
-->
6253+
<Node Name="Widget" Bounds="432,298" Id="R4NNLbLLb4NPFHeomfK03n">
6254+
<p:NodeReference>
6255+
<Choice Kind="ForwardDefinition" Name="Forward" />
6256+
<FullNameCategoryReference ID="Primitive" />
6257+
</p:NodeReference>
6258+
<p:TypeAnnotation LastCategoryFullName="RCP.Protocol" LastDependency="RCPSharp.dll">
6259+
<Choice Kind="TypeFlag" Name="Widget" />
6260+
</p:TypeAnnotation>
6261+
<Patch Id="FS7IbWSm0jSOFuzzpVdfaj">
6262+
<Canvas Id="QXN8G3S0k4FOUkrWienjpz" BordersChecked="false" CanvasType="Group" />
6263+
<ProcessDefinition Id="LG6ToFPaiwZMN9AXrkp41w" IsHidden="true" />
6264+
</Patch>
6265+
</Node>
6266+
<!--
6267+
6268+
************************ Widgettype ************************
6269+
6270+
-->
6271+
<Node Name="Widgettype" Bounds="419,358" Id="R83o2lLk8YdMBOFWBBtTNM">
6272+
<p:NodeReference>
6273+
<Choice Kind="ForwardRecordDefinition" Name="Immutable Forward" />
6274+
<CategoryReference Kind="Category" Name="Primitive" />
6275+
</p:NodeReference>
6276+
<p:TypeAnnotation LastCategoryFullName="RCP.Protocol.RcpTypes" LastDependency="RCPSharp.dll">
6277+
<Choice Kind="TypeFlag" Name="Widgettype" />
6278+
</p:TypeAnnotation>
6279+
<Patch Id="CgKbnBzA3IsLTLqKDEWyWp">
6280+
<Canvas Id="QsHHcio9GFmPc87hMB5a6O" BordersChecked="false" CanvasType="Group" />
6281+
<ProcessDefinition Id="TJZmXiapRAyOEZrs282I7K" IsHidden="true" />
6282+
</Patch>
6283+
</Node>
6284+
</Canvas>
62656285
</Canvas>
62666286
<!--
62676287

‎deployment/VL.IO.RCP.nuspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
33
<metadata>
44
<id>VL.IO.RCP</id>
5-
<version>0.8.1-alpha</version>
5+
<version>0.8.2-alpha</version>
66
<title>VL.IO.RCP</title>
77
<authors>RabbitControl</authors>
88
<owners>RabbitControl</owners>
@@ -13,7 +13,7 @@
1313
<tags>VL, rcp, rabbitcontrol, remotecontrol, rabbithole, UI</tags>
1414
<license type="expression">LGPL-3.0-only</license>
1515
<dependencies>
16-
<dependency id="RCPSharp" version="0.4.2-alpha" />
16+
<dependency id="RCPSharp" version="0.4.3-alpha" />
1717
</dependencies>
1818
<icon>icon\nugeticon.png</icon>
1919
</metadata>

0 commit comments

Comments
 (0)