From f3d27f9d9da4a77b1067fa07f18584019f921cd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaakko=20Kera=CC=88nen?= Date: Tue, 25 Aug 2015 15:14:24 +0300 Subject: [PATCH] Fixed|libappfw|PopupMenuWidget: Inverted popup menu items colors --- doomsday/sdk/libappfw/src/widgets/popupmenuwidget.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/doomsday/sdk/libappfw/src/widgets/popupmenuwidget.cpp b/doomsday/sdk/libappfw/src/widgets/popupmenuwidget.cpp index cd2786cd6a..971df946f3 100644 --- a/doomsday/sdk/libappfw/src/widgets/popupmenuwidget.cpp +++ b/doomsday/sdk/libappfw/src/widgets/popupmenuwidget.cpp @@ -205,8 +205,9 @@ DENG_GUI_PIMPL(PopupMenuWidget) void setButtonColors(ButtonWidget &button) { - button.setTextColor(!infoStyle? "text" : "inverted.text"); - button.setHoverTextColor(!infoStyle? "inverted.text" : "text", + bool const hovering = (hover == &button); + button.setTextColor(!hovering ^ infoStyle? "text" : "inverted.text"); + button.setHoverTextColor(!hovering ^ infoStyle? "inverted.text" : "text", ButtonWidget::ReplaceColor); } @@ -463,9 +464,10 @@ void PopupMenuWidget::panelClosing() if(d->hover) { - d->hover->setTextModulationColorf(style().colors().colorf(!d->infoStyle? "text" : "inverted.text")); - d->hover->setImageColor(style().colors().colorf(!d->infoStyle? "text" : "inverted.text")); + auto &btn = *d->hover; d->hover = 0; + d->setButtonColors(btn); + btn.setImageColor(style().colors().colorf(!d->infoStyle? "text" : "inverted.text")); requestGeometry(); }