Merge branch 'master' of https://github.com/JetBrains/lets-plot

JetBrains · Sep 28, 2023 · f81b141 · f81b141
2 parents 9c3dec4 + 0150081
commit f81b141
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/demo/plot/src/commonMain/kotlin/demo/plot/shared/model/component/AxisComponentDemo.kt b/demo/plot/src/commonMain/kotlin/demo/plot/shared/model/component/AxisComponentDemo.kt
@@ -139,7 +139,7 @@ open class AxisComponentDemo : SimpleDemoBase(DEMO_BOX_SIZE) {
  val themeOptions = baselineValues + mapOf(
  ThemeOption.PANEL_GRID to mapOf(ThemeOption.Elem.COLOR to Color.RED)
  )
- val theme = DefaultTheme(themeOptions)
+ val theme = DefaultTheme.withBaseFlavor(themeOptions)
 
  val axis = AxisComponent(
  length = axisLength,

diff --git a/demo/plot/src/commonMain/kotlin/demo/plot/shared/model/component/ScatterDemo.kt b/demo/plot/src/commonMain/kotlin/demo/plot/shared/model/component/ScatterDemo.kt
@@ -97,7 +97,7 @@ open class ScatterDemo : SimpleDemoBase() {
  // Render
  val groupComponent = GroupComponent()
 
- val theme = DefaultTheme(ThemeValuesRClassic().values)
+ val theme = DefaultTheme.withBaseFlavor(ThemeValuesRClassic().values)
 
  run {
  // X axis
@@ -281,7 +281,7 @@ open class ScatterDemo : SimpleDemoBase() {
  // coord system
  val coord = Coords.DemoAndTest.create(domainX, domainY, demoInnerSize)
 
- val theme = DefaultTheme(ThemeValuesRClassic().values)
+ val theme = DefaultTheme.withBaseFlavor(ThemeValuesRClassic().values)
 
  run {
  // X axis

diff --git a/...c/commonMain/kotlin/org/jetbrains/letsPlot/core/plot/builder/defaultTheme/DefaultTheme.kt b/...c/commonMain/kotlin/org/jetbrains/letsPlot/core/plot/builder/defaultTheme/DefaultTheme.kt
@@ -8,6 +8,7 @@ package org.jetbrains.letsPlot.core.plot.builder.defaultTheme
 import org.jetbrains.letsPlot.core.plot.base.GeomKind
 import org.jetbrains.letsPlot.core.plot.base.aes.GeomTheme
 import org.jetbrains.letsPlot.core.plot.base.theme.*
+import org.jetbrains.letsPlot.core.plot.builder.defaultTheme.values.ThemeOption.Flavor
 import org.jetbrains.letsPlot.core.plot.builder.defaultTheme.values.ThemeValuesLPMinimal2
 import org.jetbrains.letsPlot.core.plot.builder.presentation.DefaultFontFamilyRegistry
 import org.jetbrains.letsPlot.core.plot.builder.presentation.FontFamilyRegistry
@@ -48,7 +49,10 @@ class DefaultTheme(
 
  companion object {
  // For demo and tests
- fun minimal2() =
- DefaultTheme(ThemeValuesLPMinimal2().values)
+ fun minimal2() = withBaseFlavor(ThemeValuesLPMinimal2().values)
+
+ fun withBaseFlavor(themeValues: Map<String, Any>) = DefaultTheme(
+ ThemeFlavorUtil.applyFlavor(themeValues, Flavor.BASE)
+ )
  }
 }