Skip to content

Commit

Permalink
Merge pull request #765 from JetBrains/bugfix/avoid_unnecessary_layou…
Browse files Browse the repository at this point in the history 
…ting_of_subdiagrams

bugfix/avoid unnecessary layouting of subdiagrams
  • Loading branch information
@alexanderpann
alexanderpann authored Feb 13, 2024
2 parents 254ed6e + 97c9d23 commit aa2d7a8
Show file tree
Hide file tree
Showing 2 changed files with 102 additions and 19 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ The project does _not_ follow Semantic Versioning and the changes are documented

## Feburary 2024

- de.itemis.mps.editor.diagram: Avoid unnecessary layouting of sub-diagrams
- de.itemis.mps.editor.diagram: A layouting bug related to ports was fixed.

## January 2024
Expand Down
120 changes: 101 additions & 19 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 @@ -10023,6 +10023,17 @@
<node concept="37vLTw" id="4MPZfBDWkga" role="37wK5m">
<ref role="3cqZAo" node="4KKQOHIOec7" resolve="myGraph" />
</node>
<node concept="3y3z36" id="4msYRQGsvaq" role="37wK5m">
<node concept="2OqwBi" id="2u7UHDFa8G7" role="3uHU7B">
<node concept="37vLTw" id="2u7UHDFa8G8" role="2Oq$k0">
<ref role="3cqZAo" node="6rrvvVe3kzu" resolve="dmodel" />
</node>
<node concept="liA8E" id="2u7UHDFa8G9" role="2OqNvi">
<ref role="37wK5l" to="nkm5:6rrvvVdEqoK" resolve="getParentModel" />
</node>
</node>
<node concept="10Nm6u" id="2u7UHDFa8G6" role="3uHU7w" />
</node>
</node>
</node>
<node concept="liA8E" id="4MPZfBDJaV7" role="2OqNvi">
Expand Down Expand Up @@ -93444,7 +93455,12 @@
<ref role="3uigEE" node="190K99KhFiz" resolve="MyGraph" />
</node>
</node>
<node concept="2tJIrI" id="4MPZfBDPCdi" role="jymVt" />
<node concept="312cEg" id="2u7UHDF9$tT" role="jymVt">
<property role="TrG5h" value="isSubDiagram" />
<node concept="10P_77" id="2u7UHDF9z_A" role="1tU5fm" />
<node concept="3clFbT" id="2u7UHDF9_TS" role="33vP2m" />
</node>
<node concept="2tJIrI" id="2u7UHDF9xqt" role="jymVt" />
<node concept="3clFbW" id="4MPZfBDPDaX" role="jymVt">
<node concept="3cqZAl" id="4MPZfBDPDaY" role="3clF45" />
<node concept="3Tm1VV" id="4MPZfBDPDaZ" role="1B3o_S" />
Expand All @@ -93459,13 +93475,30 @@
</node>
</node>
</node>
<node concept="3clFbF" id="2u7UHDF9ByW" role="3cqZAp">
<node concept="37vLTI" id="2u7UHDF9CB1" role="3clFbG">
<node concept="37vLTw" id="2u7UHDF9D81" role="37vLTx">
<ref role="3cqZAo" node="2u7UHDF9_W9" resolve="topMost" />
</node>
<node concept="2OqwBi" id="2u7UHDF9BGn" role="37vLTJ">
<node concept="Xjq3P" id="2u7UHDF9ByU" role="2Oq$k0" />
<node concept="2OwXpG" id="2u7UHDF9C7R" role="2OqNvi">
<ref role="2Oxat6" node="2u7UHDF9$tT" resolve="topMost" />
</node>
</node>
</node>
</node>
</node>
<node concept="37vLTG" id="4MPZfBDPDb4" role="3clF46">
<property role="TrG5h" value="graph" />
<node concept="3uibUv" id="4MPZfBDPDb3" role="1tU5fm">
<ref role="3uigEE" node="190K99KhFiz" resolve="MyGraph" />
</node>
</node>
<node concept="37vLTG" id="2u7UHDF9_W9" role="3clF46">
<property role="TrG5h" value="isSubDiagram" />
<node concept="10P_77" id="2u7UHDF9A_U" role="1tU5fm" />
</node>
</node>
<node concept="2tJIrI" id="4MPZfBDPCQj" role="jymVt" />
<node concept="3clFb_" id="4MPZfBDJeqZ" role="jymVt">
Expand Down Expand Up @@ -94083,30 +94116,79 @@
</node>
</node>
<node concept="3clFbH" id="6aI3wo9DsN2" role="3cqZAp" />
<node concept="3clFbJ" id="6aI3wo9DsUH" role="3cqZAp">
<node concept="3clFbS" id="6aI3wo9DsUJ" role="3clFbx">
<node concept="3clFbF" id="6aI3wo9DEnn" role="3cqZAp">
<node concept="1rXfSq" id="6aI3wo9DEnl" role="3clFbG">
<ref role="37wK5l" node="6aI3wo9DuFT" resolve="processSubECell" />
<node concept="1eOMI4" id="6aI3wo9DEoc" role="37wK5m">
<node concept="10QFUN" id="6aI3wo9DEo9" role="1eOMHV">
<node concept="3uibUv" id="6aI3wo9DEoe" role="10QFUM">
<ref role="3uigEE" node="5S8_I2FXUUF" resolve="SubDiagramECell" />
</node>
<node concept="37vLTw" id="6aI3wo9DEof" role="10QFUP">
<ref role="3cqZAo" node="6aI3wo9DjKJ" resolve="ecell" />
<node concept="3clFbJ" id="2u7UHDF9FgJ" role="3cqZAp">
<node concept="3clFbS" id="2u7UHDF9FgL" role="3clFbx">
<node concept="3SKdUt" id="4msYRQGsPbP" role="3cqZAp">
<node concept="1PaTwC" id="4msYRQGsPbQ" role="1aUNEU">
<node concept="3oM_SD" id="4msYRQGsPG3" role="1PaTwD">
<property role="3oM_SC" value="for" />
</node>
<node concept="3oM_SD" id="4msYRQGsPG5" role="1PaTwD">
<property role="3oM_SC" value="the" />
</node>
<node concept="3oM_SD" id="4msYRQGsPG8" role="1PaTwD">
<property role="3oM_SC" value="top" />
</node>
<node concept="3oM_SD" id="4msYRQGsPGc" role="1PaTwD">
<property role="3oM_SC" value="diagram" />
</node>
<node concept="3oM_SD" id="4msYRQGsPGh" role="1PaTwD">
<property role="3oM_SC" value="the" />
</node>
<node concept="3oM_SD" id="4msYRQGsPGn" role="1PaTwD">
<property role="3oM_SC" value="layout" />
</node>
<node concept="3oM_SD" id="4msYRQGsPGu" role="1PaTwD">
<property role="3oM_SC" value="is" />
</node>
<node concept="3oM_SD" id="4msYRQGsPGA" role="1PaTwD">
<property role="3oM_SC" value="ran" />
</node>
<node concept="3oM_SD" id="4msYRQGsPGJ" role="1PaTwD">
<property role="3oM_SC" value="recursively" />
</node>
<node concept="3oM_SD" id="4msYRQGsPHD" role="1PaTwD">
<property role="3oM_SC" value="to" />
</node>
<node concept="3oM_SD" id="4msYRQGsPHO" role="1PaTwD">
<property role="3oM_SC" value="all" />
</node>
<node concept="3oM_SD" id="4msYRQGsPI0" role="1PaTwD">
<property role="3oM_SC" value="sub-diagrams" />
</node>
</node>
</node>
<node concept="3clFbJ" id="6aI3wo9DsUH" role="3cqZAp">
<node concept="3clFbS" id="6aI3wo9DsUJ" role="3clFbx">
<node concept="3clFbF" id="6aI3wo9DEnn" role="3cqZAp">
<node concept="1rXfSq" id="6aI3wo9DEnl" role="3clFbG">
<ref role="37wK5l" node="6aI3wo9DuFT" resolve="processSubECell" />
<node concept="1eOMI4" id="6aI3wo9DEoc" role="37wK5m">
<node concept="10QFUN" id="6aI3wo9DEo9" role="1eOMHV">
<node concept="3uibUv" id="6aI3wo9DEoe" role="10QFUM">
<ref role="3uigEE" node="5S8_I2FXUUF" resolve="SubDiagramECell" />
</node>
<node concept="37vLTw" id="6aI3wo9DEof" role="10QFUP">
<ref role="3cqZAo" node="6aI3wo9DjKJ" resolve="ecell" />
</node>
</node>
</node>
</node>
</node>
</node>
<node concept="2ZW3vV" id="6aI3wo9DsZv" role="3clFbw">
<node concept="3uibUv" id="6aI3wo9Dtve" role="2ZW6by">
<ref role="3uigEE" node="5S8_I2FXUUF" resolve="SubDiagramECell" />
</node>
<node concept="37vLTw" id="6aI3wo9DsXu" role="2ZW6bz">
<ref role="3cqZAo" node="6aI3wo9DjKJ" resolve="ecell" />
</node>
</node>
</node>
</node>
<node concept="2ZW3vV" id="6aI3wo9DsZv" role="3clFbw">
<node concept="3uibUv" id="6aI3wo9Dtve" role="2ZW6by">
<ref role="3uigEE" node="5S8_I2FXUUF" resolve="SubDiagramECell" />
</node>
<node concept="37vLTw" id="6aI3wo9DsXu" role="2ZW6bz">
<ref role="3cqZAo" node="6aI3wo9DjKJ" resolve="ecell" />
<node concept="3fqX7Q" id="4msYRQGsN1N" role="3clFbw">
<node concept="37vLTw" id="4msYRQGsN1P" role="3fr31v">
<ref role="3cqZAo" node="2u7UHDF9$tT" resolve="isSubDiagram" />
</node>
</node>
</node>
Expand Down

0 comments on commit aa2d7a8

Please sign in to comment.