Fix flash-of-color on displaying popup windows

Closes #14
kirill-grouchnikov · Jan 20, 2022 · 67d44cd · 67d44cd
1 parent 5778767
commit 67d44cd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/...rc/desktopMain/kotlin/org/pushingpixels/aurora/component/utils/CommandMenuPopupContent.kt b/...rc/desktopMain/kotlin/org/pushingpixels/aurora/component/utils/CommandMenuPopupContent.kt
@@ -87,6 +87,10 @@ internal fun displayPopupContent(
     popupContentWindow.isUndecorated = true
     popupContentWindow.isResizable = false
 
+    val fillColor = skinColors.getBackgroundColorScheme(decorationAreaType).backgroundFillColor
+    val awtFillColor = fillColor.awtColor
+    popupContentWindow.background = awtFillColor
+
     val locationOnScreen = currentWindow.rootPane.locationOnScreen
 
     val hasButtonPanel = (contentModel.value!!.panelContentModel != null)
@@ -327,8 +331,6 @@ internal fun displayPopupContent(
     )
     val popupBorderColor = skinPainters.borderPainter.getRepresentativeColor(borderScheme)
     val awtBorderColor = popupBorderColor.awtColor
-    val fillColor = skinColors.getBackgroundColorScheme(decorationAreaType).backgroundFillColor
-    val awtFillColor = fillColor.awtColor
     val borderThickness = 1.0f / density.density
 
     popupContentWindow.rootPane.border = object : Border {

diff --git a/...rc/desktopMain/kotlin/org/pushingpixels/aurora/component/utils/RichTooltipPopupContent.kt b/...rc/desktopMain/kotlin/org/pushingpixels/aurora/component/utils/RichTooltipPopupContent.kt
@@ -90,6 +90,10 @@ internal fun displayRichTooltipContent(
     popupContentWindow.isUndecorated = true
     popupContentWindow.isResizable = false
 
+    val fillColor = skinColors.getBackgroundColorScheme(decorationAreaType).backgroundFillColor
+    val awtFillColor = fillColor.awtColor
+    popupContentWindow.background = awtFillColor
+
     val locationOnScreen = currentWindow.rootPane.locationOnScreen
 
     val offset = ceil(density.density).toInt()
@@ -347,8 +351,6 @@ internal fun displayRichTooltipContent(
     )
     val popupBorderColor = skinPainters.borderPainter.getRepresentativeColor(borderScheme)
     val awtBorderColor = popupBorderColor.awtColor
-    val fillColor = skinColors.getBackgroundColorScheme(decorationAreaType).backgroundFillColor
-    val awtFillColor = fillColor.awtColor
     val borderThickness = 1.0f / density.density
 
     popupContentWindow.rootPane.border = object : Border {