This is an automated email from the git hooks/post-receive script. thansen pushed a commit to branch master in repository aseprite.
commit fcca96d6a310ae22cdc7ffd079f450ef42e48fca Author: David Capello <[email protected]> Date: Tue Apr 19 15:43:12 2016 -0300 Add missing text in StatusBar::showColor() --- src/app/ui/status_bar.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/app/ui/status_bar.cpp b/src/app/ui/status_bar.cpp index bf836f6..7fd01cd 100644 --- a/src/app/ui/status_bar.cpp +++ b/src/app/ui/status_bar.cpp @@ -624,8 +624,13 @@ void StatusBar::showTip(int msecs, const char *format, ...) void StatusBar::showColor(int msecs, const char* text, const app::Color& color) { - if (setStatusText(msecs, text)) { - IndicatorsGeneration(m_indicators).add(color); + if ((base::current_tick() > m_timeout) || (msecs > 0)) { + IndicatorsGeneration gen(m_indicators); + gen.add(color); + if (text) + gen.add(text); + + m_timeout = base::current_tick() + msecs; } } -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
