From: <geo...@us...> - 2010-07-15 06:43:42
|
Revision: 3666 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=3666&view=rev Author: geoffthemedio Date: 2010-07-15 06:43:36 +0000 (Thu, 15 Jul 2010) Log Message: ----------- Tweaked layout of SpeciesRow in SpeciesSelector. Modified Paths: -------------- trunk/FreeOrion/UI/CUIControls.cpp trunk/FreeOrion/msvc2008/src/Version.cpp Modified: trunk/FreeOrion/UI/CUIControls.cpp =================================================================== --- trunk/FreeOrion/UI/CUIControls.cpp 2010-07-15 03:22:18 UTC (rev 3665) +++ trunk/FreeOrion/UI/CUIControls.cpp 2010-07-15 06:43:36 UTC (rev 3666) @@ -1066,19 +1066,20 @@ // row type used in the SpeciesSelector struct SpeciesRow : public GG::ListBox::Row { SpeciesRow(const Species* species, GG::Y h) : - GG::ListBox::Row(GG::X1, h, "SpeciesRow") + GG::ListBox::Row(GG::X1, h, "SpeciesRow", GG::ALIGN_VCENTER, 0) { if (!species) return; GG::Wnd::SetName(species->Name()); - push_back(new GG::StaticGraphic(GG::X0, GG::Y0, GG::X(Value(h)), h, ClientUI::SpeciesIcon(species->Name()), GG::GRAPHIC_FITGRAPHIC)); + push_back(new GG::StaticGraphic(GG::X0, GG::Y0, GG::X(Value(h) - 6), h - 6, ClientUI::SpeciesIcon(species->Name()), GG::GRAPHIC_FITGRAPHIC)); push_back(new GG::TextControl(GG::X0, GG::Y0, Width() - GG::X(Value(h)), h, UserString(species->Name()), ClientUI::GetFont(), ClientUI::TextColor(), GG::FORMAT_LEFT | GG::FORMAT_VCENTER)); - SetColWidth(0, GG::X(Value(h))); + SetColWidth(0, GG::X(Value(h) - 6)); SetColWidth(1, SPECIES_SELECTOR_WIDTH - GG::X(Value(h))); } }; } + SpeciesSelector::SpeciesSelector(GG::Y h) : CUIDropDownList(GG::X0, GG::Y0, SPECIES_SELECTOR_WIDTH, h - 8, 12 * h) { Modified: trunk/FreeOrion/msvc2008/src/Version.cpp =================================================================== --- trunk/FreeOrion/msvc2008/src/Version.cpp 2010-07-15 03:22:18 UTC (rev 3665) +++ trunk/FreeOrion/msvc2008/src/Version.cpp 2010-07-15 06:43:36 UTC (rev 3666) @@ -1,7 +1,7 @@ #include "../../util/Version.h" namespace { - static const std::string retval = "after v0.3.14 [Rev 3662]"; + static const std::string retval = "after v0.3.14 [Rev 3666]"; } const std::string& FreeOrionVersionString() |