Skip to content

Commit f9c73d8

Browse files
author
Alexander Pann
authored
Merge pull request #1102 from JetBrains/bugfix/more_stable_port_layouting
2 parents 12af958 + a4ab1ca commit f9c73d8

File tree

1 file changed

+80
-24
lines changed
  • code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime

1 file changed

+80
-24
lines changed

‎code/diagram/solutions/de.itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps‎

Lines changed: 80 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -11707,7 +11707,7 @@
1170711707
<node concept="3clFbF" id="1tbbSi4Sn63" role="3cqZAp">
1170811708
<node concept="2YIFZM" id="1tbbSi4SnNC" role="3clFbG">
1170911709
<ref role="1Pybhc" node="3FRjz$vys4Z" resolve="PortLayouter" />
11710-
<ref role="37wK5l" node="2BjZSlQJ_ry" resolve="layoutPortCells" />
11710+
<ref role="37wK5l" node="6O6KyRn8ret" resolve="layoutPortCells" />
1171111711
<node concept="1eOMI4" id="1tbbSi4SoFi" role="37wK5m">
1171211712
<node concept="10QFUN" id="1tbbSi4SoFh" role="1eOMHV">
1171311713
<node concept="37vLTw" id="1tbbSi4SoFg" role="10QFUP">
@@ -11718,6 +11718,7 @@
1171811718
</node>
1171911719
</node>
1172011720
</node>
11721+
<node concept="3clFbT" id="6O6KyRn9RFZ" role="37wK5m" />
1172111722
</node>
1172211723
</node>
1172311724
</node>
@@ -108820,6 +108821,9 @@
108820108821
</node>
108821108822
<node concept="liA8E" id="3FRjz$vGeTq" role="2OqNvi">
108822108823
<ref role="37wK5l" node="3FRjz$vyxaH" resolve="layoutPortCells" />
108824+
<node concept="3clFbT" id="6O6KyRn8AIg" role="37wK5m">
108825+
<property role="3clFbU" value="true" />
108826+
</node>
108823108827
</node>
108824108828
</node>
108825108829
</node>
@@ -108847,41 +108851,75 @@
108847108851
<property role="DiZV1" value="false" />
108848108852
<property role="od$2w" value="false" />
108849108853
<node concept="3clFbS" id="2BjZSlQJ_rz" role="3clF47">
108850-
<node concept="3clFbF" id="2BjZSlQJ_r$" role="3cqZAp">
108851-
<node concept="2OqwBi" id="2BjZSlQJ_r_" role="3clFbG">
108852-
<node concept="2ShNRf" id="2BjZSlQJ_rA" role="2Oq$k0">
108853-
<node concept="1pGfFk" id="2BjZSlQJ_rB" role="2ShVmc">
108854+
<node concept="3clFbF" id="6O6KyRn8CWl" role="3cqZAp">
108855+
<node concept="1rXfSq" id="6O6KyRn8CWk" role="3clFbG">
108856+
<ref role="37wK5l" node="6O6KyRn8ret" resolve="layoutPortCells" />
108857+
<node concept="37vLTw" id="6O6KyRn8D7Y" role="37wK5m">
108858+
<ref role="3cqZAo" node="2BjZSlQJ_rI" resolve="parentCell" />
108859+
</node>
108860+
<node concept="3clFbT" id="6O6KyRnsXRn" role="37wK5m">
108861+
<property role="3clFbU" value="true" />
108862+
</node>
108863+
</node>
108864+
</node>
108865+
</node>
108866+
<node concept="37vLTG" id="2BjZSlQJ_rI" role="3clF46">
108867+
<property role="TrG5h" value="parentCell" />
108868+
<node concept="3uibUv" id="xqQxwszNam" role="1tU5fm">
108869+
<ref role="3uigEE" node="f4v_NgJPyX" resolve="BoxDCell" />
108870+
</node>
108871+
</node>
108872+
<node concept="3cqZAl" id="2BjZSlQJ_rK" role="3clF45" />
108873+
<node concept="3Tm1VV" id="2BjZSlQJ_rL" role="1B3o_S" />
108874+
</node>
108875+
<node concept="2tJIrI" id="6O6KyRn8req" role="jymVt" />
108876+
<node concept="2YIFZL" id="6O6KyRn8ret" role="jymVt">
108877+
<property role="TrG5h" value="layoutPortCells" />
108878+
<property role="DiZV1" value="false" />
108879+
<property role="od$2w" value="false" />
108880+
<node concept="3clFbS" id="6O6KyRn8reu" role="3clF47">
108881+
<node concept="3clFbF" id="6O6KyRn8rev" role="3cqZAp">
108882+
<node concept="2OqwBi" id="6O6KyRn8rew" role="3clFbG">
108883+
<node concept="2ShNRf" id="6O6KyRn8rex" role="2Oq$k0">
108884+
<node concept="1pGfFk" id="6O6KyRn8rey" role="2ShVmc">
108854108885
<ref role="37wK5l" node="3FRjz$vyT_L" resolve="PortLayouter" />
108855-
<node concept="2OqwBi" id="xqQxwsKNoj" role="37wK5m">
108856-
<node concept="2OqwBi" id="2BjZSlQJDBi" role="2Oq$k0">
108857-
<node concept="37vLTw" id="2BjZSlQJD$H" role="2Oq$k0">
108858-
<ref role="3cqZAo" node="2BjZSlQJ_rI" resolve="parentCell" />
108886+
<node concept="2OqwBi" id="6O6KyRn8rez" role="37wK5m">
108887+
<node concept="2OqwBi" id="6O6KyRn8re$" role="2Oq$k0">
108888+
<node concept="37vLTw" id="6O6KyRn8re_" role="2Oq$k0">
108889+
<ref role="3cqZAo" node="6O6KyRn8reF" resolve="parentCell" />
108859108890
</node>
108860-
<node concept="liA8E" id="2BjZSlQJDKg" role="2OqNvi">
108891+
<node concept="liA8E" id="6O6KyRn8reA" role="2OqNvi">
108861108892
<ref role="37wK5l" node="xqQxwsyFUA" resolve="getPorts" />
108862108893
</node>
108863108894
</node>
108864-
<node concept="ANE8D" id="xqQxwsKP5t" role="2OqNvi" />
108895+
<node concept="ANE8D" id="6O6KyRn8reB" role="2OqNvi" />
108865108896
</node>
108866-
<node concept="37vLTw" id="2BjZSlQJ_rD" role="37wK5m">
108867-
<ref role="3cqZAo" node="2BjZSlQJ_rI" resolve="parentCell" />
108897+
<node concept="37vLTw" id="6O6KyRn8reC" role="37wK5m">
108898+
<ref role="3cqZAo" node="6O6KyRn8reF" resolve="parentCell" />
108868108899
</node>
108869108900
</node>
108870108901
</node>
108871-
<node concept="liA8E" id="2BjZSlQJ_rE" role="2OqNvi">
108902+
<node concept="liA8E" id="6O6KyRn8reD" role="2OqNvi">
108872108903
<ref role="37wK5l" node="3FRjz$vyxaH" resolve="layoutPortCells" />
108904+
<node concept="37vLTw" id="6O6KyRn8reE" role="37wK5m">
108905+
<ref role="3cqZAo" node="6O6KyRn8reH" resolve="keepFittedSize" />
108906+
</node>
108873108907
</node>
108874108908
</node>
108875108909
</node>
108876108910
</node>
108877-
<node concept="37vLTG" id="2BjZSlQJ_rI" role="3clF46">
108911+
<node concept="37vLTG" id="6O6KyRn8reF" role="3clF46">
108878108912
<property role="TrG5h" value="parentCell" />
108879-
<node concept="3uibUv" id="xqQxwszNam" role="1tU5fm">
108913+
<node concept="3uibUv" id="6O6KyRn8reG" role="1tU5fm">
108880108914
<ref role="3uigEE" node="f4v_NgJPyX" resolve="BoxDCell" />
108881108915
</node>
108882108916
</node>
108883-
<node concept="3cqZAl" id="2BjZSlQJ_rK" role="3clF45" />
108884-
<node concept="3Tm1VV" id="2BjZSlQJ_rL" role="1B3o_S" />
108917+
<node concept="37vLTG" id="6O6KyRn8reH" role="3clF46">
108918+
<property role="TrG5h" value="keepFittedSize" />
108919+
<node concept="10P_77" id="6O6KyRn8reI" role="1tU5fm" />
108920+
</node>
108921+
<node concept="3cqZAl" id="6O6KyRn8reJ" role="3clF45" />
108922+
<node concept="3Tm1VV" id="6O6KyRn8reK" role="1B3o_S" />
108885108923
</node>
108886108924
<node concept="2tJIrI" id="3FRjz$vz2gC" role="jymVt" />
108887108925
<node concept="312cEg" id="3FRjz$vyOx4" role="jymVt">
@@ -109189,6 +109227,9 @@
109189109227
<node concept="3clFbF" id="61tQzM6bsb0" role="3cqZAp">
109190109228
<node concept="1rXfSq" id="61tQzM6bsaY" role="3clFbG">
109191109229
<ref role="37wK5l" node="61tQzM6beoK" resolve="doLayoutPorts" />
109230+
<node concept="37vLTw" id="6O6KyRniKhD" role="37wK5m">
109231+
<ref role="3cqZAo" node="6O6KyRniB6Z" resolve="keepFittedSize" />
109232+
</node>
109192109233
</node>
109193109234
</node>
109194109235
<node concept="3clFbF" id="147Asf0q3OA" role="3cqZAp">
@@ -109202,6 +109243,10 @@
109202109243
</node>
109203109244
</node>
109204109245
</node>
109246+
<node concept="37vLTG" id="6O6KyRniB6Z" role="3clF46">
109247+
<property role="TrG5h" value="keepFittedSize" />
109248+
<node concept="10P_77" id="6O6KyRniB6Y" role="1tU5fm" />
109249+
</node>
109205109250
</node>
109206109251
<node concept="2tJIrI" id="61tQzM672xv" role="jymVt" />
109207109252
<node concept="3clFb_" id="61tQzM6beoK" role="jymVt">
@@ -109563,18 +109608,29 @@
109563109608
</node>
109564109609
</node>
109565109610
</node>
109566-
<node concept="3fqX7Q" id="5eqlYwi$jmV" role="3clFbw">
109567-
<node concept="2OqwBi" id="5eqlYwi$pVU" role="3fr31v">
109568-
<node concept="37vLTw" id="5eqlYwi$nel" role="2Oq$k0">
109569-
<ref role="3cqZAo" node="3FRjz$vyOxb" resolve="parentCell" />
109611+
<node concept="1Wc70l" id="6O6KyRnYdHB" role="3clFbw">
109612+
<node concept="3fqX7Q" id="6O6KyRnYse6" role="3uHU7w">
109613+
<node concept="37vLTw" id="6O6KyRnYse8" role="3fr31v">
109614+
<ref role="3cqZAo" node="6O6KyRniNzy" resolve="keepFittedSize" />
109570109615
</node>
109571-
<node concept="liA8E" id="5eqlYwi$vZ_" role="2OqNvi">
109572-
<ref role="37wK5l" node="5eqlYwiatMq" resolve="containsSubdiagram" />
109616+
</node>
109617+
<node concept="3fqX7Q" id="5eqlYwi$jmV" role="3uHU7B">
109618+
<node concept="2OqwBi" id="5eqlYwi$pVU" role="3fr31v">
109619+
<node concept="37vLTw" id="5eqlYwi$nel" role="2Oq$k0">
109620+
<ref role="3cqZAo" node="3FRjz$vyOxb" resolve="parentCell" />
109621+
</node>
109622+
<node concept="liA8E" id="5eqlYwi$vZ_" role="2OqNvi">
109623+
<ref role="37wK5l" node="5eqlYwiatMq" resolve="containsSubdiagram" />
109624+
</node>
109573109625
</node>
109574109626
</node>
109575109627
</node>
109576109628
</node>
109577109629
</node>
109630+
<node concept="37vLTG" id="6O6KyRniNzy" role="3clF46">
109631+
<property role="TrG5h" value="keepFittedSize" />
109632+
<node concept="10P_77" id="6O6KyRniWxY" role="1tU5fm" />
109633+
</node>
109578109634
</node>
109579109635
<node concept="2tJIrI" id="61tQzM6bcoE" role="jymVt" />
109580109636
<node concept="312cEg" id="67wtfYkgacz" role="jymVt">

0 commit comments

Comments
 (0)