From 6ca4a09f5d28659bf9f106dc76d7d5fe78df56b1 Mon Sep 17 00:00:00 2001 From: Kirill Kirichenko Date: Mon, 14 Sep 2020 16:11:15 +0300 Subject: [PATCH] IDEA-250338 Plugin theme is applied when "Sync with OS" theme is set GitOrigin-RevId: 8aee8c1e60dc2024ae75f3ec58d35ec986c411a5 --- .../src/com/intellij/ide/ui/laf/LafManagerImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/platform-impl/src/com/intellij/ide/ui/laf/LafManagerImpl.java b/platform/platform-impl/src/com/intellij/ide/ui/laf/LafManagerImpl.java index 5d07c531260f..538da62da9ff 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/laf/LafManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/laf/LafManagerImpl.java @@ -1253,7 +1253,7 @@ public final class LafManagerImpl extends LafManager implements PersistentStateC updateLafComboboxModel(); // When updating a theme plugin that doesn't provide the current theme, don't select any of its themes as current - if (!myUpdatingPlugin || newTheme.getTheme().getId().equals(myThemeIdBeforePluginUpdate)) { + if (!autodetect && (!myUpdatingPlugin || newTheme.getTheme().getId().equals(myThemeIdBeforePluginUpdate))) { setLookAndFeelImpl(newTheme, false, false); JBColor.setDark(newTheme.getTheme().isDark()); updateUI();