MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-331405 adjusted the visibility of 'useDefaults' methods in AbstractColorsScheme to hide it from public API

Browse Source 
GitOrigin-RevId: fa2984b97e1dd85c642d0d67b147fbba48b4d131
This commit is contained in:
Vera Petrenkova
2023-12-08 09:56:49 +00:00
committed by intellij-monorepo-bot
parent 88fc03be53
commit d31e9ef795
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/editor-ui-ex/src/com/intellij/openapi/editor/colors/impl/AbstractColorsScheme.java
+4 -5
View File
@@ -960,8 +960,8 @@ public abstract class AbstractColorsScheme extends EditorFontCacheImpl implement
}
}
//this made to make possible compare color schemes inside EditorColorManager
//to prevent cyclic init (getDefaultAttributes uses EditorColorManager.getInstance)
// this made to make possible compare color schemes inside EditorColorManager
// to prevent cyclic init (getDefaultAttributes uses EditorColorManager.getInstance)
this.setUseDefaults(useDefaults);
otherScheme.setUseDefaults(useDefaults);
@@ -1022,12 +1022,11 @@ public abstract class AbstractColorsScheme extends EditorFontCacheImpl implement
sourceScheme.attributesMap.forEach((key, attributes) -> attributesMap.putIfAbsent(key, attributes));
}
public boolean isUseDefaults() {
boolean isUseDefaults() {
return useDefaults;
}
public void setUseDefaults(boolean useDefaults) {
private void setUseDefaults(boolean useDefaults) {
this.useDefaults = useDefaults;
if (parentScheme != null && parentScheme instanceof AbstractColorsScheme abstractColorsScheme) {
abstractColorsScheme.setUseDefaults(useDefaults);
platform/platform-impl/src/com/intellij/ide/ui/laf/LafManagerImpl.kt
-1
View File
@@ -343,7 +343,6 @@ class LafManagerImpl(private val coroutineScope: CoroutineScope) : LafManager(),
return element
}
//IDEA-331405 Hide IntelliJ Light from new UI
private fun Element.getThemeNameWithReplacingDeprecated(): String? {
val currentTheme = this.getAttributeValue(ATTRIBUTE_THEME_NAME)
if (ExperimentalUI.isNewUI() && currentTheme == "JetBrainsLightTheme") {
platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/EditorColorsManagerImpl.kt
-1
View File
@@ -493,7 +493,6 @@ class EditorColorsManagerImpl @NonInjectable constructor(schemeManagerFactory: S
activity.end()
}
//IDEA-331405 Hide IntelliJ Light from new UI
private fun hideIntellijLightSchemeIfNeeded(state: State) {
if (!ExperimentalUI.isNewUI()) return
val themeName = "IntelliJ Light"