8000 Limit interface scale by AlbyIanna · Pull Request #1502 · arduino/arduino-ide · GitHub
[go: up one dir, main page]
Skip to content

Limit interface scale #1502

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

Merged
merged 9 commits into from
Oct 6, 2022
Merged

Limit interface scale #1502

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ebe4b40
limit interface scale
Sep 23, 2022
bc0ea85
debounce interface scale updates
Sep 26, 2022
dd53eac
limit font-size + refactor
Sep 26, 2022
ca22d78
remove excessive settings duplicate
Sep 27, 2022
4a64138
remove useless async
Oct 3, 2022
402ae13
fix interface scale step
Oct 3, 2022
d0566ec
change mainMenuManager visibility to private
Oct 3, 2022
26f99c6
fix menu registration
Oct 4, 2022
b118a1f
update menu actions when autoScaleInterface changes
Oct 4, 2022
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
Prev Previous commit
Next Next commit
debounce interface scale updates
  • Loading branch information
Alberto Iannaccone committed Oct 6, 2022
commit bc0ea85a15e90b9d1fac921baedbd7f084a623f8
109 changes: 68 additions & 41 deletions arduino-ide-extension/src/browser/contributions/edit-contributions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,17 @@ import {
CommandRegistry,
} from './contribution';
import { ArduinoMenus, PlaceholderMenuNode } from '../menu/arduino-menus';
import { DisposableCollection, nls } from '@theia/core/lib/common';
import {
DisposableCollection,
MaybePromise,
nls,
} from '@theia/core/lib/common';
import type { ICodeEditor } from '@theia/monaco-editor-core/esm/vs/editor/browser/editorBrowser';
import type { StandaloneCodeEditor } from '@theia/monaco-editor-core/esm/vs/editor/standalone/browser/standaloneCodeEditor';

import { Settings } from '../dialogs/settings/settings';
import { MainMenuManager } from '../../common/main-menu-manager';
import debounce = require('lodash.debounce');

// TODO: [macOS]: to remove `Start Dictation...` and `Emoji & Symbol` see this thread: https://github.com/electron/electron/issues/8283#issuecomment-269522072
// Depends on https://github.com/eclipse-theia/theia/pull/7964
Expand All @@ -39,25 +44,24 @@ export class EditContributions extends Contribution {
decrease: true,
};

private checkInterfaceScaleMenuActions(settings: Settings): void {
let newFontScalingEnabled: EditContributions.FontScalingEnabled = {
increase: true,
decrease: true,
private currentScale: EditContributions.ScaleSettings;
private currentSettings: Settings;
private updateSettingsDebounced = debounce(
async () => {
await this.settingsService.update(this.currentSettings);
await this.settingsService.save();
},
100,
{ maxWait: 200 }
);

override onStart(): MaybePromise<void> {
const updateCurrent = (settings: Settings) => {
this.currentSettings = settings;
this.currentScale = { ...settings };
};
if (settings.autoScaleInterface) {
newFontScalingEnabled = {
increase: settings.interfaceScale < EditContributions.ZoomLevel.MAX,
decrease: settings.interfaceScale > EditContributions.ZoomLevel.MIN,
};
10000 }
const isChanged = Object.keys(newFontScalingEnabled).some(
(key: keyof EditContributions.FontScalingEnabled) =>
newFontScalingEnabled[key] !== this.fontScalingEnabled[key]
);
if (isChanged) {
this.registerInterfaceScaleMenuActions(newFontScalingEnabled);
}
this.fontScalingEnabled = newFontScalingEnabled;
this.settingsService.onDidChange((settings) => updateCurrent(settings));
this.settingsService.settings().then((settings) => updateCurrent(settings));
}

override registerCommands(registry: CommandRegistry): void {
Expand Down Expand Up @@ -86,31 +90,11 @@ export class EditContributions extends Contribution {
execute: () => this.run('editor.action.previousSelectionMatchFindAction'),
});
registry.registerCommand(EditContributions.Commands.INCREASE_FONT_SIZE, {
execute: async () => {
const settings = await this.settingsService.settings();
if (settings.autoScaleInterface) {
settings.interfaceScale = settings.interfaceScale + 1;
} else {
settings.editorFontSize = settings.editorFontSize + 1;
}
await this.settingsService.update(settings);
await this.settingsService.save();
this.checkInterfaceScaleMenuActions(settings);
},
execute: () => this.updateFontSize('increase'),
isEnabled: () => this.fontScalingEnabled.increase,
});
registry.registerCommand(EditContributions.Commands.DECREASE_FONT_SIZE, {
execute: async () => {
const settings = await this.settingsService.settings();
if (settings.autoScaleInterface) {
settings.interfaceScale = settings.interfaceScale - 1;
} else {
settings.editorFontSize = settings.editorFontSize - 1;
}
await this.settingsService.update(settings);
await this.settingsService.save();
this.checkInterfaceScaleMenuActions(settings);
},
execute: () => this.updateFontSize('decrease'),
isEnabled: () => this.fontScalingEnabled.decrease,
});
/* Tools */ registry.registerCommand(
Expand Down Expand Up @@ -371,6 +355,44 @@ ${value}
}
}
}

private async updateFontSize(mode: 'increase' | 'decrease'): Promise<void> {
if (this.currentSettings.autoScaleInterface) {
mode === 'increase'
? this.currentScale.interfaceScale++
: this.currentScale.interfaceScale--;
} else {
mode === 'increase'
? this.currentScale.editorFontSize++
: this.currentScale.editorFontSize++;
}
this.currentSettings = {
...this.currentSettings,
editorFontSize: this.currentScale.editorFontSize,
interfaceScale: this.currentScale.interfaceScale,
};
let newFontScalingEnabled: EditContributions.FontScalingEnabled = {
increase: true,
decrease: true,
};
if (this.currentSettings.autoScaleInterface) {
newFontScalingEnabled = {
increase:
this.currentSettings.interfaceScale < EditContributions.ZoomLevel.MAX,
decrease:
this.currentSettings.interfaceScale > EditContributions.ZoomLevel.MIN,
};
}
const isChanged = Object.keys(newFontScalingEnabled).some(
(key: keyof EditContributions.FontScalingEnabled) =>
newFontScalingEnabled[key] !== this.fontScalingEnabled[key]
);
if (isChanged) {
this.registerInterfaceScaleMenuActions(newFontScalingEnabled);
}
this.fontScalingEnabled = newFontScalingEnabled;
this.updateSettingsDebounced();
}
}

export namespace EditContributions {
Expand Down Expand Up @@ -422,4 +444,9 @@ export namespace EditContributions {
increase: boolean;
decrease: boolean;
}

export type ScaleSettings = Pick<
Settings,
'interfaceScale' | 'editorFontSize'
>;
}
0