From eb5b8328ec6d172d16cbe6954a5be3b659cc7e12 Mon Sep 17 00:00:00 2001 From: "[CST] Focus" Date: Mon, 16 Jul 2012 19:11:17 +0400 Subject: [PATCH] gui/widget/menue.cpp: fade-in, if menu was hidden, for testing --- src/gui/widget/menue.cpp | 4 ++++ src/gui/widget/menue.h | 1 + 2 files changed, 5 insertions(+) diff --git a/src/gui/widget/menue.cpp b/src/gui/widget/menue.cpp index f88a50752..12e88ee89 100644 --- a/src/gui/widget/menue.cpp +++ b/src/gui/widget/menue.cpp @@ -670,6 +670,8 @@ int CMenuWidget::exec(CMenuTarget* parent, const std::string &) break; case menu_return::RETURN_REPAINT: case menu_return::RETURN_EXIT_REPAINT: + if (fade && washidden) + fader.StartFadeIn(); paint(); break; } @@ -761,6 +763,7 @@ void CMenuWidget::hide() for (unsigned int count = 0; count < items.size(); count++) items[count]->init(-1, 0, 0, 0); hint_painted = false; + washidden = true; } void CMenuWidget::calcSize() @@ -903,6 +906,7 @@ void CMenuWidget::paint() item_start_y = y+hheight; paintItems(); + washidden = false; } void CMenuWidget::setMenuPos(const int& menu_width) diff --git a/src/gui/widget/menue.h b/src/gui/widget/menue.h index dfb4f3730..4b3c0e15f 100644 --- a/src/gui/widget/menue.h +++ b/src/gui/widget/menue.h @@ -454,6 +454,7 @@ class CMenuWidget : public CMenuTarget bool exit_pressed; bool from_wizard; bool fade; + bool washidden; void Init(const std::string & Icon, const int mwidth, const mn_widget_id_t &w_index); virtual void paintItems();