From: <tz...@us...> - 2010-04-28 21:00:23
|
Revision: 3557 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=3557&view=rev Author: tzlaine Date: 2010-04-28 21:00:17 +0000 (Wed, 28 Apr 2010) Log Message: ----------- Hid the CombatWnd Turn button during combat setup. Modified Paths: -------------- trunk/FreeOrion/UI/CombatWnd.cpp Modified: trunk/FreeOrion/UI/CombatWnd.cpp =================================================================== --- trunk/FreeOrion/UI/CombatWnd.cpp 2010-04-28 20:55:11 UTC (rev 3556) +++ trunk/FreeOrion/UI/CombatWnd.cpp 2010-04-28 21:00:17 UTC (rev 3557) @@ -716,6 +716,7 @@ m_end_turn_button->MoveTo( GG::Pt(GG::X(5), GG::GUI::GetGUI()->AppHeight() - m_end_turn_button->Height() - GG::Y(5))); GG::Connect(m_end_turn_button->ClickedSignal, boost::bind(&CombatWnd::EndTurn, this)); + m_end_turn_button->Hide(); AttachChild(m_end_turn_button); AttachChild(m_fps_text); @@ -1159,6 +1160,8 @@ m_end_turn_button->Disable(false); m_time_since_last_turn_update = 0.0; + m_end_turn_button->Show(); + // TODO: Handle object removals. } |