Skip to content

Live change of theme from Preferences dropdown #1296

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 8 commits into from
Aug 9, 2022
Merged

Live change of theme from Preferences dropdown #1296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8d4fff5
live change of theme from preferences
francescospissu Aug 5, 2022
d323b66
change reset function
francescospissu Aug 5, 2022
23246b6
correct prevThemeId
francescospissu Aug 5, 2022
df35cb0
Revert "correct prevThemeId"
francescospissu Aug 5, 2022
cdbe468
Revert "change reset function"
francescospissu Aug 5, 2022
56fe3d5
Revert "live change of theme from preferences"
francescospissu Aug 5, 2022
1826414
dirty hack for live theme change
Aug 5, 2022
9b0644c
change theme dropdown value without referencing the state
francescospissu Aug 9, 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
10 changes: 4 additions & 6 deletions arduino-ide-extension/src/browser/dialogs/settings/settings-component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,12 +201,7 @@ export class SettingsComponent extends React.Component<
<div className="flex-line">
<select
className="theia-select"
value={
ThemeService.get()
.getThemes()
.find(({ id }) => id === this.state.themeId)?.label ||
nls.localize('arduino/common/unknown', 'Unknown')
}
value={ThemeService.get().getCurrentTheme().label}
onChange={this.themeDidChange}
>
{ThemeService.get()
Expand Down Expand Up @@ -591,6 +586,9 @@ export class SettingsComponent extends React.Component<
const theme = ThemeService.get().getThemes()[selectedIndex];
if (theme) {
this.setState({ themeId: theme.id });
if (ThemeService.get().getCurrentTheme().id !== theme.id) {
ThemeService.get().setCurrentTheme(theme.id);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kittaakos is the method .setCurrentTheme also called by Theia code after we click apply on the settings dialog?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes.

}
}
};

Expand Down
12 changes: 12 additions & 0 deletions arduino-ide-extension/src/browser/dialogs/settings/settings-dialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import { SettingsComponent } from './settings-component';
import { AsyncLocalizationProvider } from '@theia/core/lib/common/i18n/localization';
import { AdditionalUrls } from '../../../common/protocol';
import { AbstractDialog } from '../../theia/dialogs/dialogs';
import { ThemeService } from '@theia/core/lib/browser/theming';

@injectable()
export class SettingsWidget extends ReactWidget {
Expand Down Expand Up @@ -118,6 +119,17 @@ export class SettingsDialog extends AbstractDialog<Promise<Settings>> {

this.widget.activate();
}

override async open(): Promise<Promise<Settings> | undefined> {
const themeIdBeforeOpen = ThemeService.get().getCurrentTheme().id;
const result = await super.open();
if (!result) {
if (ThemeService.get().getCurrentTheme().id !== themeIdBeforeOpen) {
ThemeService.get().setCurrentTheme(themeIdBeforeOpen);
}
}
return result;
}
}

export class AdditionalUrlsDialog extends AbstractDialog<string[]> {
Expand Down