Skip to content

Led matrix undo stack fix #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
glastonbridge wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

Led matrix undo stack fix #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a91498b
Prevented LED matrix from swamping the undo stack
glastonbridge Jul 17, 2025
49a7093
Fix erroneous option in flyout menu change variable block (#10772)
glastonbridge Jul 17, 2025
860858d
Escape closes context menu without closing flyout. Area menu can full…
glastonbridge Jul 17, 2025
0f21334
Merge branch 'master' into led-matrix-undo-stack
riknoll Jul 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pxtblocks/builtins/variables.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ export function initVariables() {
* @this Blockly.Block
*/
customContextMenu: function (this: Blockly.BlockSvg, options: any[]) {
if (!(this.workspace?.options?.readOnly)) {
if (!(this.workspace?.options?.readOnly) && !this.isInFlyout) {
let option: any = {
enabled: this.workspace.remainingCapacity() > 0
};
Expand Down
3 changes: 2 additions & 1 deletion pxtblocks/fields/field_ledmatrix.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,8 @@ export class FieldLedMatrix extends FieldMatrix implements FieldCustom {
}

setValue(newValue: string | number, restoreState = true) {
super.setValue(String(newValue));
const shouldFireChangeEvent = newValue !== this.value_;
super.setValue(String(newValue), shouldFireChangeEvent);
if (this.matrixSvg) {
if (restoreState) this.restoreStateFromString();

Expand Down
8 changes: 5 additions & 3 deletions webapp/src/app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3742,10 +3742,10 @@ export class ProjectView
if (enabled) {
document.addEventListener('keydown', this.closeOnEscape);
simulator.driver.focus();
this.closeFlyout();
} else {
document.removeEventListener('keydown', this.closeOnEscape);
}
this.closeFlyout();
this.setState({ fullscreen: enabled });
}

Expand Down Expand Up @@ -5332,8 +5332,10 @@ export class ProjectView
///////////////////////////////////////////////////////////

toggleAreaMenu() {
// Close the simulator if needed.
if (this.state.fullscreen) {
// Restore the simulator if needed. If the area menu is open, allow the simulator to
// stay fullscreened. The desired behaviour is that the mini sim can be fullscreened
// through the area menu, otherwise it has been restored already.
if (this.state.fullscreen && !this.state.areaMenuOpen) {
this.setSimulatorFullScreen(false);
}

Expand Down