-
-
Notifications
You must be signed in to change notification settings - Fork 446
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.
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
Limit interface scale #1502
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
ebe4b40
limit interface scale
bc0ea85
debounce interface scale updates
dd53eac
limit font-size + refactor
ca22d78
remove excessive settings duplicate
4a64138
remove useless async
402ae13
fix interface scale step
d0566ec
change mainMenuManager visibility to private
26f99c6
fix menu registration
b118a1f
update menu actions when autoScaleInterface changes
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
228 changes: 228 additions & 0 deletions
228
arduino-ide-extension/src/browser/contributions/interface-scale.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,228 @@ | ||
| import { inject, injectable } from '@theia/core/shared/inversify'; | ||
| import { | ||
| Contribution, | ||
| Command, | ||
| MenuModelRegistry, | ||
| KeybindingRegistry, | ||
| } from './contribution'; | ||
| import { ArduinoMenus, PlaceholderMenuNode } from '../menu/arduino-menus'; | ||
| import { | ||
| CommandRegistry, | ||
| DisposableCollection, | ||
| MaybePromise, | ||
| nls, | ||
| } from '@theia/core/lib/common'; | ||
|
|
||
| import { Settings } from '../dialogs/settings/settings'; | ||
| import { MainMenuManager } from '../../common/main-menu-manager'; | ||
| import debounce = require('lodash.debounce'); | ||
|
|
||
| @injectable() | ||
| export class InterfaceScale extends Contribution { | ||
| @inject(MenuModelRegistry) | ||
| private readonly menuRegistry: MenuModelRegistry; | ||
|
|
||
| @inject(MainMenuManager) | ||
| private readonly mainMenuManager: MainMenuManager; | ||
|
|
||
| private readonly menuActionsDisposables = new DisposableCollection(); | ||
| private fontScalingEnabled: InterfaceScale.FontScalingEnabled = { | ||
| increase: true, | ||
| decrease: true, | ||
| }; | ||
|
|
||
| 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.updateFontScalingEnabled(); | ||
| }; | ||
| this.settingsService.onDidChange((settings) => updateCurrent(settings)); | ||
| this.settingsService.settings().then((settings) => updateCurrent(settings)); | ||
| } | ||
|
|
||
| override registerCommands(registry: CommandRegistry): void { | ||
| registry.registerCommand(InterfaceScale.Commands.INCREASE_FONT_SIZE, { | ||
| execute: () => this.updateFontSize('increase'), | ||
| isEnabled: () => this.fontScalingEnabled.increase, | ||
| }); | ||
| registry.registerCommand(InterfaceScale.Commands.DECREASE_FONT_SIZE, { | ||
| execute: () => this.updateFontSize('decrease'), | ||
| isEnabled: () => this.fontScalingEnabled.decrease, | ||
| }); | ||
| } | ||
|
|
||
| override registerMenus(registry: MenuModelRegistry): void { | ||
| this.menuActionsDisposables.dispose(); | ||
| const increaseFontSizeMenuAction = { | ||
| commandId: InterfaceScale.Commands.INCREASE_FONT_SIZE.id, | ||
| label: nls.localize( | ||
| 'arduino/editor/increaseFontSize', | ||
| 'Increase Font Size' | ||
| ), | ||
| order: '0', | ||
| }; | ||
| const decreaseFontSizeMenuAction = { | ||
| commandId: InterfaceScale.Commands.DECREASE_FONT_SIZE.id, | ||
| label: nls.localize( | ||
| 'arduino/editor/decreaseFontSize', | ||
| 'Decrease Font Size' | ||
| ), | ||
| order: '1', | ||
| }; | ||
|
|
||
| if (this.fontScalingEnabled.increase) { | ||
| this.menuActionsDisposables.push( | ||
| registry.registerMenuAction( | ||
| ArduinoMenus.EDIT__FONT_CONTROL_GROUP, | ||
| increaseFontSizeMenuAction | ||
| ) | ||
| ); | ||
| } else { | ||
| this.menuActionsDisposables.push( | ||
| registry.registerMenuNode( | ||
| ArduinoMenus.EDIT__FONT_CONTROL_GROUP, | ||
| new PlaceholderMenuNode( | ||
| ArduinoMenus.EDIT__FONT_CONTROL_GROUP, | ||
| increaseFontSizeMenuAction.label, | ||
| { order: increaseFontSizeMenuAction.order } | ||
| ) | ||
| ) | ||
| ); | ||
| } | ||
| if (this.fontScalingEnabled.decrease) { | ||
| this.menuActionsDisposables.push( | ||
| this.menuRegistry.registerMenuAction( | ||
| ArduinoMenus.EDIT__FONT_CONTROL_GROUP, | ||
| decreaseFontSizeMenuAction | ||
| ) | ||
| ); | ||
| } else { | ||
| this.menuActionsDisposables.push( | ||
| this.menuRegistry.registerMenuNode( | ||
| ArduinoMenus.EDIT__FONT_CONTROL_GROUP, | ||
| new PlaceholderMenuNode( | ||
| ArduinoMenus.EDIT__FONT_CONTROL_GROUP, | ||
| decreaseFontSizeMenuAction.label, | ||
| { order: decreaseFontSizeMenuAction.order } | ||
| ) | ||
| ) | ||
| ); | ||
| } | ||
| this.mainMenuManager.update(); | ||
| } | ||
|
|
||
| private updateFontScalingEnabled(): void { | ||
| let fontScalingEnabled = { | ||
| increase: true, | ||
| decrease: true, | ||
| }; | ||
|
|
||
| if (this.currentSettings.autoScaleInterface) { | ||
| fontScalingEnabled = { | ||
| increase: | ||
| this.currentSettings.interfaceScale + InterfaceScale.ZoomLevel.STEP <= | ||
| InterfaceScale.ZoomLevel.MAX, | ||
| decrease: | ||
| this.currentSettings.interfaceScale - InterfaceScale.ZoomLevel.STEP >= | ||
| InterfaceScale.ZoomLevel.MIN, | ||
| }; | ||
| } else { | ||
| fontScalingEnabled = { | ||
| increase: | ||
| this.currentSettings.editorFontSize + InterfaceScale.FontSize.STEP <= | ||
| InterfaceScale.FontSize.MAX, | ||
| decrease: | ||
| this.currentSettings.editorFontSize - InterfaceScale.FontSize.STEP >= | ||
| InterfaceScale.FontSize.MIN, | ||
| }; | ||
| } | ||
|
|
||
| const isChanged = Object.keys(fontScalingEnabled).some( | ||
| (key: keyof InterfaceScale.FontScalingEnabled) => | ||
| fontScalingEnabled[key] !== this.fontScalingEnabled[key] | ||
| ); | ||
| if (isChanged) { | ||
| this.fontScalingEnabled = fontScalingEnabled; | ||
| this.registerMenus(this.menuRegistry); | ||
| } | ||
| } | ||
|
|
||
| private updateFontSize(mode: 'increase' | 'decrease'): void { | ||
| if (this.currentSettings.autoScaleInterface) { | ||
| mode === 'increase' | ||
| ? (this.currentSettings.interfaceScale += InterfaceScale.ZoomLevel.STEP) | ||
| : (this.currentSettings.interfaceScale -= | ||
| InterfaceScale.ZoomLevel.STEP); | ||
| } else { | ||
| mode === 'increase' | ||
| ? (this.currentSettings.editorFontSize += InterfaceScale.FontSize.STEP) | ||
| : (this.currentSettings.editorFontSize -= InterfaceScale.FontSize.STEP); | ||
| } | ||
| this.updateFontScalingEnabled(); | ||
| this.updateSettingsDebounced(); | ||
kittaakos marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| override registerKeybindings(registry: KeybindingRegistry): void { | ||
| registry.registerKeybinding({ | ||
| command: InterfaceScale.Commands.INCREASE_FONT_SIZE.id, | ||
| keybinding: 'CtrlCmd+=', | ||
| }); | ||
| registry.registerKeybinding({ | ||
| command: InterfaceScale.Commands.DECREASE_FONT_SIZE.id, | ||
| keybinding: 'CtrlCmd+-', | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| export namespace InterfaceScale { | ||
| export namespace Commands { | ||
| export const INCREASE_FONT_SIZE: Command = { | ||
| id: 'arduino-increase-font-size', | ||
| }; | ||
| export const DECREASE_FONT_SIZE: Command = { | ||
| id: 'arduino-decrease-font-size', | ||
| }; | ||
| } | ||
|
|
||
| export namespace ZoomLevel { | ||
| export const MIN = -8; | ||
| export const MAX = 9; | ||
| export const STEP = 1; | ||
|
|
||
| export function toPercentage(scale: number): number { | ||
| return scale * 20 + 100; | ||
| } | ||
| export function fromPercentage(percentage: number): number { | ||
| return (percentage - 100) / 20; | ||
| } | ||
| export namespace Step { | ||
| export function toPercentage(step: number): number { | ||
| return step * 20; | ||
| } | ||
| export function fromPercentage(percentage: number): number { | ||
| return percentage / 20; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| export namespace FontSize { | ||
| export const MIN = 8; | ||
| export const MAX = 72; | ||
| export const STEP = 2; | ||
| } | ||
|
|
||
| export interface FontScalingEnabled { | ||
| increase: boolean; | ||
| decrease: boolean; | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.