Skip to content

Commit fed9e68

Browse files
mps-ci-buildbotmps-ci-buildbot
authored
Merge pull request #1149 from JetBrains/merge/mps20243
Merge maintenance/mps20241 into maintenance/mps20243
2 parents e79326c + 7e29fdb commit fed9e68

File tree

10 files changed

+1183
-64
lines changed

10 files changed

+1183
-64
lines changed

‎CHANGELOG.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,16 @@ All notable changes to this project are documented in this file.
44

55
The format 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.
66

7+
## January 2025
8+
9+
### Fixed
10+
11+
- *de.itemis.mps.editor.diagram*: An issue was fixed where diagrams with sub-diagrams had ports at the wrong position when the diagram was first opened
12+
13+
### Added
14+
15+
- *de.itemis.mps.editor.diagram*: Some more options of the diagram component like the pan amount and minimum scaling can now be customized in the diagram editor
16+
717
## December 2024
818

919
### Changed

‎code/blutil/languages/com.mbeddr.mpsutil.blutil/languageModels/editor.mps‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,16 @@
9494
<concept id="6718020819487620873" name="jetbrains.mps.lang.editor.structure.TransformationMenuReference_Named" flags="ng" index="A1WHu">
9595
<reference id="6718020819487620874" name="menu" index="A1WHt" />
9696
</concept>
97+
<concept id="5944657839000868711" name="jetbrains.mps.lang.editor.structure.ConceptEditorContextHints" flags="ig" index="2ABfQD">
98+
<child id="5944657839000877563" name="hints" index="2ABdcP" />
99+
</concept>
97100
<concept id="3547227755871693971" name="jetbrains.mps.lang.editor.structure.PredefinedSelector" flags="ng" index="2B6iha">
98101
<property id="2162403111523065396" name="cellId" index="1lyBwo" />
99102
</concept>
103+
<concept id="5944657839003601246" name="jetbrains.mps.lang.editor.structure.ConceptEditorHintDeclaration" flags="ig" index="2BsEeg">
104+
<property id="168363875802087287" name="showInUI" index="2gpH_U" />
105+
<property id="5944657839012629576" name="presentation" index="2BUmq6" />
106+
</concept>
100107
<concept id="3473224453637651916" name="jetbrains.mps.lang.editor.structure.TransformationLocation_SideTransform_PlaceInCellHolder" flags="ng" index="CtIbL">
101108
<property id="3473224453637651917" name="placeInCell" index="CtIbK" />
102109
</concept>
@@ -4240,5 +4247,13 @@
42404247
<node concept="l2Vlx" id="i0MCu6Q" role="2iSdaV" />
42414248
</node>
42424249
</node>
4250+
<node concept="2ABfQD" id="4ji0xD6WAsy">
4251+
<property role="TrG5h" value="EditorHints" />
4252+
<node concept="2BsEeg" id="4ji0xD6WAsz" role="2ABdcP">
4253+
<property role="2gpH_U" value="true" />
4254+
<property role="TrG5h" value="performance" />
4255+
<property role="2BUmq6" value="performance" />
4256+
</node>
4257+
</node>
42434258
</model>
42444259

‎code/diagram/languages/de.itemis.mps.editor.diagram.demoentities/languageModels/editor.mps‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,9 @@
107107
<concept id="8118189177080264853" name="jetbrains.mps.baseLanguage.structure.AlternativeType" flags="ig" index="nSUau">
108108
<child id="8118189177080264854" name="alternative" index="nSUat" />
109109
</concept>
110+
<concept id="5279705229678483897" name="jetbrains.mps.baseLanguage.structure.FloatingPointFloatConstant" flags="nn" index="2$xPTn">
111+
<property id="5279705229678483899" name="value" index="2$xPTl" />
112+
</concept>
110113
<concept id="1197027756228" name="jetbrains.mps.baseLanguage.structure.DotExpression" flags="nn" index="2OqwBi">
111114
<child id="1197027771414" name="operand" index="2Oq$k0" />
112115
<child id="1197027833540" name="operation" index="2OqNvi" />
@@ -229,6 +232,11 @@
229232
<child id="1742468285817538342" name="disableNodeEditing" index="2gDVEa" />
230233
<child id="53713348769907228" name="autoLayoutOnChange" index="2hB_ot" />
231234
<child id="2060885462441433843" name="allowElementsBelowRequiredSize" index="2F3Mqr" />
235+
<child id="9014008627795543036" name="arrowKeyMoveAmount" index="3b5RbE" />
236+
<child id="9014008627795543367" name="arrowKeyMoveAmountSlow" index="3b5Rhh" />
237+
<child id="9014008627795543370" name="minimumScale" index="3b5Rhs" />
238+
<child id="9014008627795543368" name="panAmount" index="3b5Rhu" />
239+
<child id="9014008627795543369" name="panAmountSlow" index="3b5Rhv" />
232240
<child id="3401785396303280005" name="gridColor" index="1bWipe" />
233241
<child id="7349833668006295675" name="gridSize" index="3ehQaW" />
234242
<child id="5128117196760806289" name="useGridSnapping" index="3wlkzU" />
@@ -268,6 +276,7 @@
268276
<concept id="6237710625713964946" name="de.itemis.mps.editor.diagram.structure.Parameter_Node" flags="ng" index="2ZN8Hh" />
269277
<concept id="8963411245957652387" name="de.itemis.mps.editor.diagram.structure.Content_GenericElementQuery_Query" flags="ig" index="37q72E" />
270278
<concept id="8963411245958754161" name="de.itemis.mps.editor.diagram.structure.Content_GenericElementQuery_ParameterObject" flags="ng" index="37u81S" />
279+
<concept id="7899485855304485736" name="de.itemis.mps.editor.diagram.structure.QueryFunction_Float" flags="ig" index="1k1hvw" />
271280
<concept id="8637411062076624999" name="de.itemis.mps.editor.diagram.structure.Function_ConnectionTypes" flags="ig" index="1xLmZY" />
272281
<concept id="8637411062062623445" name="de.itemis.mps.editor.diagram.structure.Parameter_PaletteFolder_Concept" flags="ng" index="1yATlc" />
273282
<concept id="8637411062062430894" name="de.itemis.mps.editor.diagram.structure.Function_PaletteFolder" flags="ig" index="1yB8kR" />
@@ -932,6 +941,51 @@
932941
</node>
933942
</node>
934943
</node>
944+
<node concept="1k1hvw" id="7OochqQvfTn" role="3b5RbE">
945+
<node concept="3clFbS" id="7OochqQvfTo" role="2VODD2">
946+
<node concept="3clFbF" id="7OochqQvgdB" role="3cqZAp">
947+
<node concept="3cmrfG" id="7OochqQvgdA" role="3clFbG">
948+
<property role="3cmrfH" value="10" />
949+
</node>
950+
</node>
951+
</node>
952+
</node>
953+
<node concept="1k1hvw" id="7OochqQvgf$" role="3b5Rhh">
954+
<node concept="3clFbS" id="7OochqQvgf_" role="2VODD2">
955+
<node concept="3clFbF" id="7OochqQvgfH" role="3cqZAp">
956+
<node concept="3cmrfG" id="7OochqQvgfG" role="3clFbG">
957+
<property role="3cmrfH" value="20" />
958+
</node>
959+
</node>
960+
</node>
961+
</node>
962+
<node concept="1k1hvw" id="7OochqQvgX4" role="3b5Rhs">
963+
<node concept="3clFbS" id="7OochqQvgX5" role="2VODD2">
964+
<node concept="3clFbF" id="7OochqQvhhp" role="3cqZAp">
965+
<node concept="2$xPTn" id="7OochqQvhyq" role="3clFbG">
966+
<property role="2$xPTl" value="0.0f" />
967+
</node>
968+
</node>
969+
</node>
970+
</node>
971+
<node concept="1k1hvw" id="7OochqQvCS7" role="3b5Rhu">
972+
<node concept="3clFbS" id="7OochqQvCS8" role="2VODD2">
973+
<node concept="3clFbF" id="7OochqQvDW0" role="3cqZAp">
974+
<node concept="3cmrfG" id="7OochqQvDVZ" role="3clFbG">
975+
<property role="3cmrfH" value="10" />
976+
</node>
977+
</node>
978+
</node>
979+
</node>
980+
<node concept="1k1hvw" id="7OochqQvDZ3" role="3b5Rhv">
981+
<node concept="3clFbS" id="7OochqQvDZ4" role="2VODD2">
982+
<node concept="3clFbF" id="7OochqQvDZf" role="3cqZAp">
983+
<node concept="3cmrfG" id="7OochqQvDZe" role="3clFbG">
984+
<property role="3cmrfH" value="20" />
985+
</node>
986+
</node>
987+
</node>
988+
</node>
935989
</node>
936990
</node>
937991
<node concept="2ABfQD" id="4_qW8fWM_gV">

0 commit comments

Comments
 (0)