arranged the blocks in the unified palette column-wise

snap7
jmoenig 2021-07-03 18:44:24 +02:00
rodzic 9753f70aa9
commit 6dd99d37e7
3 zmienionych plików z 14 dodań i 4 usunięć

Wyświetl plik

@ -14,6 +14,9 @@
* fixed centering of menus, thanks, Brian Broll!
* fixed occasional invisible error messages
### 2021-07-03
* objects: arranged the blocks in the unified palette column-wise
### 2021-07-02
* gui, object, store, etc.: unified blocks palette option, thanks, Michael!
* merged scenes branch

Wyświetl plik

@ -10,7 +10,7 @@
<script src="src/widgets.js?version=2021-01-05"></script>
<script src="src/blocks.js?version=2021-07-02"></script>
<script src="src/threads.js?version=2021-06-24"></script>
<script src="src/objects.js?version=2021-07-02"></script>
<script src="src/objects.js?version=2021-07-03"></script>
<script src="src/scenes.js?version=2021-07-02"></script>
<script src="src/gui.js?version=2021-07-02"></script>
<script src="src/paint.js?version=2020-05-17"></script>

Wyświetl plik

@ -84,7 +84,7 @@ BlockEditorMorph, BlockDialogMorph, PrototypeHatBlockMorph, BooleanSlotMorph,
localize, TableMorph, TableFrameMorph, normalizeCanvas, VectorPaintEditorMorph,
AlignmentMorph, Process, WorldMap, copyCanvas, useBlurredShadows*/
modules.objects = '2021-July-02';
modules.objects = '2021-July-03';
var SpriteMorph;
var StageMorph;
@ -2943,7 +2943,8 @@ SpriteMorph.prototype.freshPalette = function (category) {
hideNextSpace = false,
shade = new Color(140, 140, 140),
searchButton,
makeButton;
makeButton,
unifiedCategories;
palette.owner = this;
palette.padding = unit / 2;
@ -3093,7 +3094,13 @@ SpriteMorph.prototype.freshPalette = function (category) {
if (category === 'unified') {
// In a Unified Palette custom blocks appear following each category,
// but there is only 1 make a block button (at the end).
blocks = this.categories.reduce((blocks, category) =>
// arrange the blocks in the unified palette column-wise:
unifiedCategories = this.categories.filter(
(elem, idx) => idx % 2 === 0
).concat(this.categories.filter(
(elem, idx) => idx % 2 === 1)
);
blocks = unifiedCategories.reduce((blocks, category) =>
blocks.concat(
this.getPrimitiveTemplates(category),
'=',