Skip to content

Commit

Permalink
Merge pull request #763 from JetBrains/merge/mps20222
Browse files Browse the repository at this point in the history 
Merge maintenance/mps20222 into maintenance/mps20223
  • Loading branch information
@alexanderpann
alexanderpann authored Feb 19, 2024
2 parents 0986d13 + d4a5e90 commit baa653f
Show file tree
Hide file tree
Showing 3 changed files with 374 additions and 151 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ All notable changes to this project are documented in this file.
Format of the log is _loosely_ based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
The project does _not_ follow Semantic Versioning and the changes are documented in reverse chronological order, grouped by calendar month.

## Feburary 2024

- de.itemis.mps.editor.diagram: A layouting bug related to ports was fixed.

## January 2024

### Fixed
Expand Down
199 changes: 152 additions & 47 deletions ....itemis.mps.editor.diagram.runtime/models/de/itemis/mps/editor/diagram/runtime/jgraph.mps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50611,6 +50611,68 @@
</node>
</node>
</node>
<node concept="2tJIrI" id="5eqlYwitP22" role="jymVt" />
<node concept="3clFb_" id="5eqlYwiatMq" role="jymVt">
<property role="TrG5h" value="containsSubdiagram" />
<node concept="3clFbS" id="5eqlYwiatMt" role="3clF47">
<node concept="1Dw8fO" id="5eqlYwiaCFI" role="3cqZAp">
<node concept="3clFbS" id="5eqlYwiaCFJ" role="2LFqv$">
<node concept="3clFbJ" id="5eqlYwiaSg8" role="3cqZAp">
<node concept="3clFbS" id="5eqlYwiaSga" role="3clFbx">
<node concept="3cpWs6" id="5eqlYwib3MT" role="3cqZAp">
<node concept="3clFbT" id="5eqlYwib88$" role="3cqZAk">
<property role="3clFbU" value="true" />
</node>
</node>
</node>
<node concept="2ZW3vV" id="5eqlYwiaUP_" role="3clFbw">
<node concept="3uibUv" id="5eqlYwiaXMn" role="2ZW6by">
<ref role="3uigEE" node="7SMOZKNYVb6" resolve="SubDiagramDCell" />
</node>
<node concept="2OqwBi" id="5eqlYwiaCFO" role="2ZW6bz">
<node concept="Xjq3P" id="5eqlYwibgi8" role="2Oq$k0" />
<node concept="liA8E" id="5eqlYwiaCFQ" role="2OqNvi">
<ref role="37wK5l" to="99ht:~mxCell.getChildAt(int)" resolve="getChildAt" />
<node concept="37vLTw" id="5eqlYwiaCFR" role="37wK5m">
<ref role="3cqZAo" node="5eqlYwiaCFS" resolve="i" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3cpWsn" id="5eqlYwiaCFS" role="1Duv9x">
<property role="TrG5h" value="i" />
<node concept="10Oyi0" id="5eqlYwiaCFT" role="1tU5fm" />
<node concept="3cmrfG" id="5eqlYwiaCFU" role="33vP2m">
<property role="3cmrfH" value="0" />
</node>
</node>
<node concept="3eOVzh" id="5eqlYwiaCFV" role="1Dwp0S">
<node concept="2OqwBi" id="5eqlYwiaCFW" role="3uHU7w">
<node concept="Xjq3P" id="5eqlYwiaEIK" role="2Oq$k0" />
<node concept="liA8E" id="5eqlYwiaCFY" role="2OqNvi">
<ref role="37wK5l" to="99ht:~mxCell.getChildCount()" resolve="getChildCount" />
</node>
</node>
<node concept="37vLTw" id="5eqlYwiaCFZ" role="3uHU7B">
<ref role="3cqZAo" node="5eqlYwiaCFS" resolve="i" />
</node>
</node>
<node concept="3uNrnE" id="5eqlYwiaCG0" role="1Dwrff">
<node concept="37vLTw" id="5eqlYwiaCG1" role="2$L3a6">
<ref role="3cqZAo" node="5eqlYwiaCFS" resolve="i" />
</node>
</node>
</node>
<node concept="3clFbF" id="5eqlYwibdMg" role="3cqZAp">
<node concept="3clFbT" id="5eqlYwibdMf" role="3clFbG" />
</node>
</node>
<node concept="3Tm1VV" id="5eqlYwianut" role="1B3o_S" />
<node concept="10P_77" id="5eqlYwiatoC" role="3clF45" />
</node>
<node concept="2tJIrI" id="5eqlYwitPvd" role="jymVt" />
</node>
<node concept="312cEu" id="f4v_NgK4Sg">
<property role="TrG5h" value="EdgeDCell" />
Expand Down Expand Up @@ -107281,22 +107343,6 @@
</node>
</node>
<node concept="3clFbH" id="1wJCVk9kcD9" role="3cqZAp" />
<node concept="3SKdUt" id="1wJCVk9k9dO" role="3cqZAp">
<node concept="1PaTwC" id="1wJCVk9k9dP" role="1aUNEU">
<node concept="3oM_SD" id="1wJCVk9k9fS" role="1PaTwD">
<property role="3oM_SC" value="temporarily" />
</node>
<node concept="3oM_SD" id="1wJCVk9kcCt" role="1PaTwD">
<property role="3oM_SC" value="fit" />
</node>
<node concept="3oM_SD" id="1wJCVk9kcCK" role="1PaTwD">
<property role="3oM_SC" value="the" />
</node>
<node concept="3oM_SD" id="1wJCVk9kcCO" role="1PaTwD">
<property role="3oM_SC" value="size" />
</node>
</node>
</node>
<node concept="3cpWs8" id="7kNDVqj9_ee" role="3cqZAp">
<node concept="3cpWsn" id="7kNDVqj9_ef" role="3cpWs9">
<property role="TrG5h" value="originalParentBounds" />
Expand All @@ -107313,16 +107359,47 @@
</node>
</node>
</node>
<node concept="3clFbF" id="6WP9pW76EZY" role="3cqZAp">
<node concept="2OqwBi" id="6WP9pW76Js4" role="3clFbG">
<node concept="37vLTw" id="6WP9pW76EZW" role="2Oq$k0">
<ref role="3cqZAo" node="3FRjz$vyOxb" resolve="parentCell" />
<node concept="3clFbJ" id="5eqlYwi6Lh8" role="3cqZAp">
<node concept="3clFbS" id="5eqlYwi6Lha" role="3clFbx">
<node concept="3SKdUt" id="1wJCVk9k9dO" role="3cqZAp">
<node concept="1PaTwC" id="1wJCVk9k9dP" role="1aUNEU">
<node concept="3oM_SD" id="1wJCVk9k9fS" role="1PaTwD">
<property role="3oM_SC" value="temporarily" />
</node>
<node concept="3oM_SD" id="1wJCVk9kcCt" role="1PaTwD">
<property role="3oM_SC" value="fit" />
</node>
<node concept="3oM_SD" id="1wJCVk9kcCK" role="1PaTwD">
<property role="3oM_SC" value="the" />
</node>
<node concept="3oM_SD" id="1wJCVk9kcCO" role="1PaTwD">
<property role="3oM_SC" value="size" />
</node>
</node>
</node>
<node concept="liA8E" id="6WP9pW76NsF" role="2OqNvi">
<ref role="37wK5l" node="5emhLECroYy" resolve="fitSize" />
<node concept="3clFbF" id="5eqlYwit$x3" role="3cqZAp">
<node concept="2OqwBi" id="5eqlYwit$x4" role="3clFbG">
<node concept="37vLTw" id="5eqlYwit$x5" role="2Oq$k0">
<ref role="3cqZAo" node="3FRjz$vyOxb" resolve="parentCell" />
</node>
<node concept="liA8E" id="5eqlYwit$x6" role="2OqNvi">
<ref role="37wK5l" node="5emhLECroYy" resolve="fitSize" />
</node>
</node>
</node>
</node>
<node concept="3fqX7Q" id="5eqlYwi77s5" role="3clFbw">
<node concept="2OqwBi" id="5eqlYwi77s8" role="3fr31v">
<node concept="37vLTw" id="5eqlYwi77s9" role="2Oq$k0">
<ref role="3cqZAo" node="3FRjz$vyOxb" resolve="parentCell" />
</node>
<node concept="liA8E" id="5eqlYwibrEn" role="2OqNvi">
<ref role="37wK5l" node="5eqlYwiatMq" resolve="containsSubdiagram" />
</node>
</node>
</node>
</node>
<node concept="3clFbH" id="5eqlYwitscP" role="3cqZAp" />
<node concept="3clFbH" id="1wJCVk9k211" role="3cqZAp" />
<node concept="3clFbF" id="61tQzM6bs6K" role="3cqZAp">
<node concept="1rXfSq" id="61tQzM6bs6L" role="3clFbG">
Expand Down Expand Up @@ -107585,28 +107662,42 @@
</node>
</node>
<node concept="3clFbH" id="7kNDVqj9QM$" role="3cqZAp" />
<node concept="3SKdUt" id="7kNDVqjacgL" role="3cqZAp">
<node concept="1PaTwC" id="7kNDVqjacgM" role="1aUNEU">
<node concept="3oM_SD" id="7kNDVqjaciJ" role="1PaTwD">
<property role="3oM_SC" value="restore" />
</node>
<node concept="3oM_SD" id="7kNDVqjaciL" role="1PaTwD">
<property role="3oM_SC" value="original" />
<node concept="3clFbJ" id="5eqlYwi$fCL" role="3cqZAp">
<node concept="3clFbS" id="5eqlYwi$fCN" role="3clFbx">
<node concept="3SKdUt" id="7kNDVqjacgL" role="3cqZAp">
<node concept="1PaTwC" id="7kNDVqjacgM" role="1aUNEU">
<node concept="3oM_SD" id="7kNDVqjaciJ" role="1PaTwD">
<property role="3oM_SC" value="restore" />
</node>
<node concept="3oM_SD" id="7kNDVqjaciL" role="1PaTwD">
<property role="3oM_SC" value="original" />
</node>
<node concept="3oM_SD" id="7kNDVqjaciO" role="1PaTwD">
<property role="3oM_SC" value="bounds" />
</node>
</node>
</node>
<node concept="3oM_SD" id="7kNDVqjaciO" role="1PaTwD">
<property role="3oM_SC" value="bounds" />
<node concept="3clFbF" id="7kNDVqj9UqX" role="3cqZAp">
<node concept="2OqwBi" id="7kNDVqj9XGA" role="3clFbG">
<node concept="37vLTw" id="7kNDVqj9UqV" role="2Oq$k0">
<ref role="3cqZAo" node="3FRjz$vyOxb" resolve="parentCell" />
</node>
<node concept="AQDAd" id="7kNDVqja2QT" role="2OqNvi">
<ref role="37wK5l" node="7MHoS6eEr8d" resolve="setBounds" />
<node concept="37vLTw" id="7kNDVqj9_ej" role="37wK5m">
<ref role="3cqZAo" node="7kNDVqj9_ef" resolve="originalParentBounds" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="3clFbF" id="7kNDVqj9UqX" role="3cqZAp">
<node concept="2OqwBi" id="7kNDVqj9XGA" role="3clFbG">
<node concept="37vLTw" id="7kNDVqj9UqV" role="2Oq$k0">
<ref role="3cqZAo" node="3FRjz$vyOxb" resolve="parentCell" />
</node>
<node concept="AQDAd" id="7kNDVqja2QT" role="2OqNvi">
<ref role="37wK5l" node="7MHoS6eEr8d" resolve="setBounds" />
<node concept="37vLTw" id="7kNDVqj9_ej" role="37wK5m">
<ref role="3cqZAo" node="7kNDVqj9_ef" resolve="originalParentBounds" />
<node concept="3fqX7Q" id="5eqlYwi$jmV" role="3clFbw">
<node concept="2OqwBi" id="5eqlYwi$pVU" role="3fr31v">
<node concept="37vLTw" id="5eqlYwi$nel" role="2Oq$k0">
<ref role="3cqZAo" node="3FRjz$vyOxb" resolve="parentCell" />
</node>
<node concept="liA8E" id="5eqlYwi$vZ_" role="2OqNvi">
<ref role="37wK5l" node="5eqlYwiatMq" resolve="containsSubdiagram" />
</node>
</node>
</node>
Expand Down Expand Up @@ -111005,13 +111096,27 @@
</node>
</node>
</node>
<node concept="3clFbF" id="t86F$IFYmu" role="3cqZAp">
<node concept="2OqwBi" id="t86F$IG1I$" role="3clFbG">
<node concept="37vLTw" id="t86F$IFYms" role="2Oq$k0">
<ref role="3cqZAo" node="3FRjz$vyOxb" resolve="parentCell" />
<node concept="3clFbJ" id="7zSY0lMXjE3" role="3cqZAp">
<node concept="3clFbS" id="7zSY0lMXjE5" role="3clFbx">
<node concept="3clFbF" id="t86F$IFYmu" role="3cqZAp">
<node concept="2OqwBi" id="t86F$IG1I$" role="3clFbG">
<node concept="37vLTw" id="t86F$IFYms" role="2Oq$k0">
<ref role="3cqZAo" node="3FRjz$vyOxb" resolve="parentCell" />
</node>
<node concept="liA8E" id="t86F$IG7Hz" role="2OqNvi">
<ref role="37wK5l" node="5emhLECroYy" resolve="fitSize" />
</node>
</node>
</node>
<node concept="liA8E" id="t86F$IG7Hz" role="2OqNvi">
<ref role="37wK5l" node="5emhLECroYy" resolve="fitSize" />
</node>
<node concept="3fqX7Q" id="7zSY0lMXA8B" role="3clFbw">
<node concept="2OqwBi" id="7zSY0lMXA8D" role="3fr31v">
<node concept="37vLTw" id="7zSY0lMXA8E" role="2Oq$k0">
<ref role="3cqZAo" node="3FRjz$vyOxb" resolve="parentCell" />
</node>
<node concept="liA8E" id="7zSY0lMXA8F" role="2OqNvi">
<ref role="37wK5l" node="5eqlYwiatMq" resolve="containsSubdiagram" />
</node>
</node>
</node>
</node>
Expand Down
Loading

0 comments on commit baa653f

Please sign in to comment.