Skip to content

Commit ffcd546

Browse files
author
Andy O'Neill
committed
feat: add quaternary color for selected dropdowns
1 parent 69baac5 commit ffcd546

23 files changed

Lines changed: 180 additions & 67 deletions

‎blocks_common/math.js‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ Blockly.Blocks['math_number'] = {
5151
"outputShape": Blockly.OUTPUT_SHAPE_ROUND,
5252
"colour": Blockly.Colours.textField,
5353
"colourSecondary": Blockly.Colours.textField,
54-
"colourTertiary": Blockly.Colours.textField
54+
"colourTertiary": Blockly.Colours.textField,
55+
"colourQuaternary": Blockly.Colours.textField
5556
});
5657
}
5758
};
@@ -75,7 +76,8 @@ Blockly.Blocks['math_integer'] = {
7576
"outputShape": Blockly.OUTPUT_SHAPE_ROUND,
7677
"colour": Blockly.Colours.textField,
7778
"colourSecondary": Blockly.Colours.textField,
78-
"colourTertiary": Blockly.Colours.textField
79+
"colourTertiary": Blockly.Colours.textField,
80+
"colourQuaternary": Blockly.Colours.textField
7981
});
8082
}
8183
};
@@ -100,7 +102,8 @@ Blockly.Blocks['math_whole_number'] = {
100102
"outputShape": Blockly.OUTPUT_SHAPE_ROUND,
101103
"colour": Blockly.Colours.textField,
102104
"colourSecondary": Blockly.Colours.textField,
103-
"colourTertiary": Blockly.Colours.textField
105+
"colourTertiary": Blockly.Colours.textField,
106+
"colourQuaternary": Blockly.Colours.textField
104107
});
105108
}
106109
};
@@ -124,7 +127,8 @@ Blockly.Blocks['math_positive_number'] = {
124127
"outputShape": Blockly.OUTPUT_SHAPE_ROUND,
125128
"colour": Blockly.Colours.textField,
126129
"colourSecondary": Blockly.Colours.textField,
127-
"colourTertiary": Blockly.Colours.textField
130+
"colourTertiary": Blockly.Colours.textField,
131+
"colourQuaternary": Blockly.Colours.textField
128132
});
129133
}
130134
};
@@ -148,7 +152,8 @@ Blockly.Blocks['math_angle'] = {
148152
"outputShape": Blockly.OUTPUT_SHAPE_ROUND,
149153
"colour": Blockly.Colours.textField,
150154
"colourSecondary": Blockly.Colours.textField,
151-
"colourTertiary": Blockly.Colours.textField
155+
"colourTertiary": Blockly.Colours.textField,
156+
"colourQuaternary": Blockly.Colours.textField
152157
});
153158
}
154159
};

‎blocks_common/note.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ Blockly.Blocks['note'] = {
5151
"output": "Number",
5252
"colour": Blockly.Colours.textField,
5353
"colourSecondary": Blockly.Colours.textField,
54-
"colourTertiary": Blockly.Colours.textField
54+
"colourTertiary": Blockly.Colours.textField,
55+
"colourQuaternary": Blockly.Colours.textField
5556
});
5657
}
5758
};

‎blocks_common/text.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ Blockly.Blocks['text'] = {
5050
"outputShape": Blockly.OUTPUT_SHAPE_ROUND,
5151
"colour": Blockly.Colours.textField,
5252
"colourSecondary": Blockly.Colours.textField,
53-
"colourTertiary": Blockly.Colours.textField
53+
"colourTertiary": Blockly.Colours.textField,
54+
"colourQuaternary": Blockly.Colours.textField
5455
});
5556
}
5657
};

‎blocks_horizontal/control.js‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ Blockly.Blocks['control_repeat'] = {
6565
"category": Blockly.Categories.control,
6666
"colour": Blockly.Colours.control.primary,
6767
"colourSecondary": Blockly.Colours.control.secondary,
68-
"colourTertiary": Blockly.Colours.control.tertiary
68+
"colourTertiary": Blockly.Colours.control.tertiary,
69+
"colourQuaternary": Blockly.Colours.control.quaternary
6970
});
7071
}
7172
};
@@ -99,7 +100,8 @@ Blockly.Blocks['control_forever'] = {
99100
"category": Blockly.Categories.control,
100101
"colour": Blockly.Colours.control.primary,
101102
"colourSecondary": Blockly.Colours.control.secondary,
102-
"colourTertiary": Blockly.Colours.control.tertiary
103+
"colourTertiary": Blockly.Colours.control.tertiary,
104+
"colourQuaternary": Blockly.Colours.control.quaternary
103105
});
104106
}
105107
};
@@ -139,7 +141,8 @@ Blockly.Blocks['control_repeat'] = {
139141
"category": Blockly.Categories.control,
140142
"colour": Blockly.Colours.control.primary,
141143
"colourSecondary": Blockly.Colours.control.secondary,
142-
"colourTertiary": Blockly.Colours.control.tertiary
144+
"colourTertiary": Blockly.Colours.control.tertiary,
145+
"colourQuaternary": Blockly.Colours.control.quaternary
143146
});
144147
}
145148
};
@@ -167,7 +170,8 @@ Blockly.Blocks['control_stop'] = {
167170
"category": Blockly.Categories.control,
168171
"colour": Blockly.Colours.control.primary,
169172
"colourSecondary": Blockly.Colours.control.secondary,
170-
"colourTertiary": Blockly.Colours.control.tertiary
173+
"colourTertiary": Blockly.Colours.control.tertiary,
174+
"colourQuaternary": Blockly.Colours.control.quaternary
171175
});
172176
}
173177
};
@@ -201,7 +205,8 @@ Blockly.Blocks['control_wait'] = {
201205
"category": Blockly.Categories.control,
202206
"colour": Blockly.Colours.control.primary,
203207
"colourSecondary": Blockly.Colours.control.secondary,
204-
"colourTertiary": Blockly.Colours.control.tertiary
208+
"colourTertiary": Blockly.Colours.control.tertiary,
209+
"colourQuaternary": Blockly.Colours.control.quaternary
205210
});
206211
}
207212
};

‎blocks_horizontal/event.js‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ Blockly.Blocks['event_whenflagclicked'] = {
5454
"category": Blockly.Categories.event,
5555
"colour": Blockly.Colours.event.primary,
5656
"colourSecondary": Blockly.Colours.event.secondary,
57-
"colourTertiary": Blockly.Colours.event.tertiary
57+
"colourTertiary": Blockly.Colours.event.tertiary,
58+
"colourQuaternary": Blockly.Colours.event.quaternary
5859
});
5960
}
6061
};
@@ -84,7 +85,8 @@ Blockly.Blocks['dropdown_whenbroadcast'] = {
8485
this.setOutput(true);
8586
this.setColour(Blockly.Colours.event.primary,
8687
Blockly.Colours.event.secondary,
87-
Blockly.Colours.event.tertiary
88+
Blockly.Colours.event.tertiary,
89+
Blockly.Colours.event.quaternary
8890
);
8991
}
9092
};
@@ -116,7 +118,8 @@ Blockly.Blocks['event_whenbroadcastreceived'] = {
116118
"category": Blockly.Categories.event,
117119
"colour": Blockly.Colours.event.primary,
118120
"colourSecondary": Blockly.Colours.event.secondary,
119-
"colourTertiary": Blockly.Colours.event.tertiary
121+
"colourTertiary": Blockly.Colours.event.tertiary,
122+
"colourQuaternary": Blockly.Colours.event.quaternary
120123
});
121124
}
122125
};
@@ -146,7 +149,8 @@ Blockly.Blocks['dropdown_broadcast'] = {
146149
this.setOutput(true);
147150
this.setColour(Blockly.Colours.event.primary,
148151
Blockly.Colours.event.secondary,
149-
Blockly.Colours.event.tertiary
152+
Blockly.Colours.event.tertiary,
153+
Blockly.Colours.event.quaternary
150154
);
151155
}
152156
};
@@ -179,7 +183,8 @@ Blockly.Blocks['event_broadcast'] = {
179183
"category": Blockly.Categories.event,
180184
"colour": Blockly.Colours.event.primary,
181185
"colourSecondary": Blockly.Colours.event.secondary,
182-
"colourTertiary": Blockly.Colours.event.tertiary
186+
"colourTertiary": Blockly.Colours.event.tertiary,
187+
"colourQuaternary": Blockly.Colours.event.quaternary
183188
});
184189
}
185190
};

‎blocks_horizontal/wedo.js‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ Blockly.Blocks['dropdown_wedo_setcolor'] = {
6161
this.setOutput(true);
6262
this.setColour(Blockly.Colours.looks.primary,
6363
Blockly.Colours.looks.secondary,
64-
Blockly.Colours.looks.tertiary
64+
Blockly.Colours.looks.tertiary,
65+
Blockly.Colours.looks.quaternary
6566
);
6667
}
6768
};
@@ -94,7 +95,8 @@ Blockly.Blocks['wedo_setcolor'] = {
9495
"category": Blockly.Categories.looks,
9596
"colour": Blockly.Colours.looks.primary,
9697
"colourSecondary": Blockly.Colours.looks.secondary,
97-
"colourTertiary": Blockly.Colours.looks.tertiary
98+
"colourTertiary": Blockly.Colours.looks.tertiary,
99+
"colourQuaternary": Blockly.Colours.looks.quaternary
98100
});
99101
}
100102
};
@@ -128,7 +130,8 @@ Blockly.Blocks['wedo_motorclockwise'] = {
128130
"category": Blockly.Categories.motion,
129131
"colour": Blockly.Colours.motion.primary,
130132
"colourSecondary": Blockly.Colours.motion.secondary,
131-
"colourTertiary": Blockly.Colours.motion.tertiary
133+
"colourTertiary": Blockly.Colours.motion.tertiary,
134+
"colourQuaternary": Blockly.Colours.motion.quaternary
132135
});
133136
}
134137
};
@@ -162,7 +165,8 @@ Blockly.Blocks['wedo_motorcounterclockwise'] = {
162165
"category": Blockly.Categories.motion,
163166
"colour": Blockly.Colours.motion.primary,
164167
"colourSecondary": Blockly.Colours.motion.secondary,
165-
"colourTertiary": Blockly.Colours.motion.tertiary
168+
"colourTertiary": Blockly.Colours.motion.tertiary,
169+
"colourQuaternary": Blockly.Colours.motion.quaternary
166170
});
167171
}
168172
};
@@ -186,7 +190,8 @@ Blockly.Blocks['dropdown_wedo_motorspeed'] = {
186190
this.setOutput(true);
187191
this.setColour(Blockly.Colours.motion.primary,
188192
Blockly.Colours.motion.secondary,
189-
Blockly.Colours.motion.tertiary
193+
Blockly.Colours.motion.tertiary,
194+
Blockly.Colours.motion.quaternary
190195
);
191196
}
192197
};
@@ -219,7 +224,8 @@ Blockly.Blocks['wedo_motorspeed'] = {
219224
"category": Blockly.Categories.motion,
220225
"colour": Blockly.Colours.motion.primary,
221226
"colourSecondary": Blockly.Colours.motion.secondary,
222-
"colourTertiary": Blockly.Colours.motion.tertiary
227+
"colourTertiary": Blockly.Colours.motion.tertiary,
228+
"colourQuaternary": Blockly.Colours.motion.quaternary
223229
});
224230
}
225231
};
@@ -250,7 +256,8 @@ Blockly.Blocks['dropdown_wedo_whentilt'] = {
250256
this.setOutput(true);
251257
this.setColour(Blockly.Colours.event.primary,
252258
Blockly.Colours.event.secondary,
253-
Blockly.Colours.event.tertiary
259+
Blockly.Colours.event.tertiary,
260+
Blockly.Colours.event.quaternary
254261
);
255262
}
256263
};
@@ -282,7 +289,8 @@ Blockly.Blocks['wedo_whentilt'] = {
282289
"category": Blockly.Categories.event,
283290
"colour": Blockly.Colours.event.primary,
284291
"colourSecondary": Blockly.Colours.event.secondary,
285-
"colourTertiary": Blockly.Colours.event.tertiary
292+
"colourTertiary": Blockly.Colours.event.tertiary,
293+
"colourQuaternary": Blockly.Colours.event.quaternary
286294
});
287295
}
288296
};
@@ -310,7 +318,8 @@ Blockly.Blocks['wedo_whendistanceclose'] = {
310318
"category": Blockly.Categories.event,
311319
"colour": Blockly.Colours.event.primary,
312320
"colourSecondary": Blockly.Colours.event.secondary,
313-
"colourTertiary": Blockly.Colours.event.tertiary
321+
"colourTertiary": Blockly.Colours.event.tertiary,
322+
"colourQuaternary": Blockly.Colours.event.quaternary
314323
});
315324
}
316325
};

‎blocks_vertical/control.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,8 @@ Blockly.Blocks['control_stop'] = {
209209
this.setCategory(Blockly.Categories.control);
210210
this.setColour(Blockly.Colours.control.primary,
211211
Blockly.Colours.control.secondary,
212-
Blockly.Colours.control.tertiary
212+
Blockly.Colours.control.tertiary,
213+
Blockly.Colours.control.quaternary
213214
);
214215
this.setPreviousStatement(true);
215216
},

‎blocks_vertical/data.js‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,7 @@ Blockly.Blocks['data_showvariable'] = {
118118
"previousStatement": null,
119119
"nextStatement": null,
120120
"category": Blockly.Categories.data,
121-
"colour": Blockly.Colours.data.primary,
122-
"colourSecondary": Blockly.Colours.data.secondary,
123-
"colourTertiary": Blockly.Colours.data.tertiary
121+
"extensions": ["colours_data"]
124122
});
125123
}
126124
};
@@ -142,9 +140,7 @@ Blockly.Blocks['data_hidevariable'] = {
142140
"previousStatement": null,
143141
"nextStatement": null,
144142
"category": Blockly.Categories.data,
145-
"colour": Blockly.Colours.data.primary,
146-
"colourSecondary": Blockly.Colours.data.secondary,
147-
"colourTertiary": Blockly.Colours.data.tertiary
143+
"extensions": ["colours_data"]
148144
});
149145
}
150146
};

‎blocks_vertical/event.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,7 @@ Blockly.Blocks['event_broadcast_menu'] = {
216216
"colour": Blockly.Colours.event.secondary,
217217
"colourSecondary": Blockly.Colours.event.secondary,
218218
"colourTertiary": Blockly.Colours.event.tertiary,
219+
"colourQuaternary": Blockly.Colours.event.quaternary,
219220
"extensions": ["output_string"]
220221
});
221222
}

‎blocks_vertical/looks.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -367,6 +367,7 @@ Blockly.Blocks['looks_costume'] = {
367367
"colour": Blockly.Colours.looks.secondary,
368368
"colourSecondary": Blockly.Colours.looks.secondary,
369369
"colourTertiary": Blockly.Colours.looks.tertiary,
370+
"colourQuaternary": Blockly.Colours.looks.quaternary,
370371
"extensions": ["output_string"]
371372
});
372373
}
@@ -447,6 +448,7 @@ Blockly.Blocks['looks_backdrops'] = {
447448
"colour": Blockly.Colours.looks.secondary,
448449
"colourSecondary": Blockly.Colours.looks.secondary,
449450
"colourTertiary": Blockly.Colours.looks.tertiary,
451+
"colourQuaternary": Blockly.Colours.looks.quaternary,
450452
"extensions": ["output_string"]
451453
});
452454
}

0 commit comments

Comments
 (0)