fixed zoom blocks type-in dialog

pull/95/head
jmoenig 2020-07-27 18:22:46 +02:00
rodzic 7739c1099e
commit 96430ade32
4 zmienionych plików z 11 dodań i 7 usunięć

Wyświetl plik

@ -26,6 +26,8 @@
* library browser: import selected library on pressing enter * library browser: import selected library on pressing enter
* fixed binding contexts to other receivers (variable scope for ASK / TELL) * fixed binding contexts to other receivers (variable scope for ASK / TELL)
* fixed numeric input fields in dialog boxes * fixed numeric input fields in dialog boxes
* fixed reacting to keyboard input in dialog boxes
* fixed zoom blocks type-in dialog
* **Documentation Updates:** * **Documentation Updates:**
* added migration guide for Morphic2/Snap!6 * added migration guide for Morphic2/Snap!6
* **Translation Updates:** * **Translation Updates:**
@ -36,6 +38,8 @@
* gui: updated "About Snap!" dialog box * gui: updated "About Snap!" dialog box
* gui: library browser: import selected library on pressing enter * gui: library browser: import selected library on pressing enter
* widgets: fixed numeric input fields in dialog boxes * widgets: fixed numeric input fields in dialog boxes
* widgets: fixed reacting to keyboard input in dialog boxes
* blocks: fixed zoom blocks type-in dialog
### 2020-07-26 ### 2020-07-26
* objects: fixed sprite speech balloon display for sounds * objects: fixed sprite speech balloon display for sounds

Wyświetl plik

@ -7,7 +7,7 @@
<script src="src/morphic.js?version=2020-07-23"></script> <script src="src/morphic.js?version=2020-07-23"></script>
<script src="src/symbols.js?version=2020-07-21"></script> <script src="src/symbols.js?version=2020-07-21"></script>
<script src="src/widgets.js?version=2020-07-27"></script> <script src="src/widgets.js?version=2020-07-27"></script>
<script src="src/blocks.js?version=2020-07-24"></script> <script src="src/blocks.js?version=2020-07-27"></script>
<script src="src/threads.js?version=2020-07-27"></script> <script src="src/threads.js?version=2020-07-27"></script>
<script src="src/objects.js?version=2020-07-26"></script> <script src="src/objects.js?version=2020-07-26"></script>
<script src="src/gui.js?version=2020-07-27"></script> <script src="src/gui.js?version=2020-07-27"></script>

Wyświetl plik

@ -158,7 +158,7 @@ CustomCommandBlockMorph, SymbolMorph, ToggleButtonMorph, DialMorph*/
// Global stuff //////////////////////////////////////////////////////// // Global stuff ////////////////////////////////////////////////////////
modules.blocks = '2020-July-24'; modules.blocks = '2020-July-27';
var SyntaxElementMorph; var SyntaxElementMorph;
var BlockMorph; var BlockMorph;
@ -6004,7 +6004,7 @@ ReporterBlockMorph.prototype.drawEdges = function (ctx) {
ReporterBlockMorph.prototype.drawEdgesOval = function (ctx) { ReporterBlockMorph.prototype.drawEdgesOval = function (ctx) {
// add 3D-Effect // add 3D-Effect
var h = this.height(), var h = this.height(),
r = Math.min(this.rounding, h / 2), r = Math.max(Math.min(this.rounding, h / 2), this.edge),
w = this.width(), w = this.width(),
shift = this.edge / 2, shift = this.edge / 2,
y, y,
@ -9732,7 +9732,7 @@ InputSlotMorph.prototype.render = function (ctx) {
this.drawRectBorder(ctx); this.drawRectBorder(ctx);
} }
} else { } else {
r = (this.height() - (this.edge * 2)) / 2; r = Math.max((this.height() - (this.edge * 2)) / 2, 0);
ctx.beginPath(); ctx.beginPath();
ctx.arc( ctx.arc(
r + this.edge, r + this.edge,
@ -9846,7 +9846,7 @@ InputSlotMorph.prototype.drawRectBorder = function (ctx) {
InputSlotMorph.prototype.drawRoundBorder = function (ctx) { InputSlotMorph.prototype.drawRoundBorder = function (ctx) {
var shift = this.edge * 0.5, var shift = this.edge * 0.5,
r = (this.height() - (this.edge * 2)) / 2, r = Math.max((this.height() - (this.edge * 2)) / 2, 0),
start, start,
end, end,
gradient; gradient;
@ -9900,7 +9900,7 @@ InputSlotMorph.prototype.drawRoundBorder = function (ctx) {
ctx.lineTo(this.width() - r - this.edge, this.height() - shift); ctx.lineTo(this.width() - r - this.edge, this.height() - shift);
ctx.stroke(); ctx.stroke();
r = this.height() / 2; r = Math.max(this.height() / 2, this.edge);
ctx.shadowOffsetX = shift; ctx.shadowOffsetX = shift;
ctx.shadowOffsetY = shift; ctx.shadowOffsetY = shift;

Wyświetl plik

@ -1682,7 +1682,7 @@ DialogBoxMorph.prototype.prompt = function (
} }
}; };
txt.reactToKeystroke = function () { txt.reactToInput = function () {
var inp = txt.getValue(); var inp = txt.getValue();
if (sld) { if (sld) {
inp = Math.max(inp, sliderMin); inp = Math.max(inp, sliderMin);