From: <geo...@us...> - 2014-02-08 06:12:25
|
Revision: 6856 http://sourceforge.net/p/freeorion/code/6856 Author: geoffthemedio Date: 2014-02-08 06:12:20 +0000 (Sat, 08 Feb 2014) Log Message: ----------- Fixed tech queue tooltips losing details between turns and taking oddly log to appear. Modified Paths: -------------- trunk/FreeOrion/UI/ResearchWnd.cpp trunk/FreeOrion/util/SerializeEmpire.cpp Modified: trunk/FreeOrion/UI/ResearchWnd.cpp =================================================================== --- trunk/FreeOrion/UI/ResearchWnd.cpp 2014-02-08 01:16:32 UTC (rev 6855) +++ trunk/FreeOrion/UI/ResearchWnd.cpp 2014-02-08 06:12:20 UTC (rev 6856) @@ -79,6 +79,9 @@ push_back(panel); SetDragDropDataType("RESEARCH_QUEUE_ROW"); + + SetBrowseModeTime(GetOptionsDB().Get<int>("UI.tooltip-delay")); + SetBrowseInfoWnd(TechPanelRowBrowseWnd(queue_element.name, queue_element.empire_id)); } ////////////////////////////////////////////////// @@ -155,10 +158,6 @@ turns_left_text, font, clr, GG::FORMAT_RIGHT); m_turns_remaining_text->ClipText(true); - - SetBrowseModeTime(GetOptionsDB().Get<int>("UI.tooltip-delay")); - SetBrowseInfoWnd(TechPanelRowBrowseWnd(tech_name, m_empire_id)); - AttachChild(m_name_text); AttachChild(m_RPs_and_turns_text); AttachChild(m_turns_remaining_text); @@ -316,9 +315,7 @@ for (ResearchQueue::const_iterator it = queue.begin(); it != queue.end(); ++it) { const ResearchQueue::Element& elem = *it; - QueueRow* row = new QueueRow(QUEUE_WIDTH, elem); - row->SetBrowseInfoWnd(TechPanelRowBrowseWnd(elem.name, empire->EmpireID())); - m_queue_lb->Insert(row); + m_queue_lb->Insert(new QueueRow(QUEUE_WIDTH, elem)); } if (!m_queue_lb->Empty()) Modified: trunk/FreeOrion/util/SerializeEmpire.cpp =================================================================== --- trunk/FreeOrion/util/SerializeEmpire.cpp 2014-02-08 01:16:32 UTC (rev 6855) +++ trunk/FreeOrion/util/SerializeEmpire.cpp 2014-02-08 06:12:20 UTC (rev 6856) @@ -12,6 +12,7 @@ void ResearchQueue::Element::serialize(Archive& ar, const unsigned int version) { ar & BOOST_SERIALIZATION_NVP(name) + & BOOST_SERIALIZATION_NVP(empire_id) & BOOST_SERIALIZATION_NVP(allocated_rp) & BOOST_SERIALIZATION_NVP(turns_left); } |