[aseprite] 80/308: Fix TipWindow background color

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit d02efbf315ebaf65d77db05acd7a7d4133ec6e8a
Author: David Capello <davidcapello at gmail.com>
Date:   Thu Dec 10 16:46:01 2015 -0300

    Fix TipWindow background color
---
 src/app/ui/skin/skin_theme.cpp | 8 +++++++-
 src/ui/tooltips.cpp            | 3 ---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/app/ui/skin/skin_theme.cpp b/src/app/ui/skin/skin_theme.cpp
index 4c18a0a..645eb35 100644
--- a/src/app/ui/skin/skin_theme.cpp
+++ b/src/app/ui/skin/skin_theme.cpp
@@ -708,8 +708,14 @@ void SkinTheme::initWidget(Widget* widget)
       else {
         BORDER(0);
       }
+
       widget->setChildSpacing(4 * scale); // TODO this hard-coded 4 should be configurable in skin.xml
-      widget->setBgColor(colors.windowFace());
+
+      // Tooltip background color
+      if (dynamic_cast<TipWindow*>(widget))
+        widget->setBgColor(SkinTheme::instance()->colors.tooltipFace());
+      else
+        widget->setBgColor(colors.windowFace());
       break;
 
     default:
diff --git a/src/ui/tooltips.cpp b/src/ui/tooltips.cpp
index aabde35..efb559b 100644
--- a/src/ui/tooltips.cpp
+++ b/src/ui/tooltips.cpp
@@ -271,9 +271,6 @@ void TipWindow::onInitTheme(InitThemeEvent& ev)
                 6 * guiscale(),
                 6 * guiscale(),
                 7 * guiscale()));
-
-  // Setup the background color.
-  setBgColor(gfx::rgba(255, 255, 200));
 }
 
 void TipWindow::onPaint(PaintEvent& ev)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git