libcommon|Menu: Fix focused menu widget alpha blending during fade out

skyjake · Sep 26, 2014 · 2da011e · 2da011e
1 parent 1cc6b4a
commit 2da011e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/doomsday/plugins/common/src/menu/widgets/buttonwidget.cpp b/doomsday/plugins/common/src/menu/widgets/buttonwidget.cpp
@@ -63,7 +63,8 @@ void ButtonWidget::draw() const
         t = (1 + sin(page().timer() / (float)TICSPERSEC * speed * DD_PI)) / 2;
     }
 
-    Vector4f const color = de::lerp(textColor, Vector4f(Vector3f(cfg.menuTextFlashColor), 1), t);
+    Vector4f const color = de::lerp(textColor, Vector4f(Vector3f(cfg.menuTextFlashColor), textColor.w), t);
+
     FR_SetFont(fontId);
     FR_SetColorAndAlpha(color.x, color.y, color.z, color.w);
     DGL_Color4f(1, 1, 1, color.w);

diff --git a/doomsday/plugins/common/src/menu/widgets/labelwidget.cpp b/doomsday/plugins/common/src/menu/widgets/labelwidget.cpp
@@ -63,7 +63,8 @@ void LabelWidget::draw() const
         t = (1 + sin(page().timer() / (float)TICSPERSEC * speed * DD_PI)) / 2;
     }
 
-    Vector4f const color = de::lerp(textColor, Vector4f(Vector3f(cfg.menuTextFlashColor), 1), t);
+    Vector4f const color = de::lerp(textColor, Vector4f(Vector3f(cfg.menuTextFlashColor), textColor.w), t);
+
     DGL_Color4f(1, 1, 1, color.w);
     FR_SetFont(fontId);
     FR_SetColorAndAlpha(color.x, color.y, color.z, color.w);

diff --git a/doomsday/plugins/common/src/menu/widgets/listwidget.cpp b/doomsday/plugins/common/src/menu/widgets/listwidget.cpp
@@ -130,10 +130,8 @@ void ListWidget::draw() const
         t = (1 + sin(page().timer() / (float)TICSPERSEC * speed * DD_PI)) / 2;
     }
 
-    Vector4f const flashColor = de::lerp(textColor, Vector4f(Vector3f(cfg.menuTextFlashColor), 1), t);
-
-    Vector4f dimColor = textColor * MNDATA_LIST_NONSELECTION_LIGHT;
-    dimColor.w = textColor.w;
+    Vector4f const flashColor = de::lerp(textColor, Vector4f(Vector3f(cfg.menuTextFlashColor), textColor.w), t);
+    Vector4f const dimColor   = Vector4f(Vector3f(textColor) * MNDATA_LIST_NONSELECTION_LIGHT, textColor.w);
 
     if(d->first < d->items.count() && d->numvis > 0)
     {