From: <geo...@us...> - 2009-02-13 15:45:33
|
Revision: 2810 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=2810&view=rev Author: geoffthemedio Date: 2009-02-13 15:45:27 +0000 (Fri, 13 Feb 2009) Log Message: ----------- Made empire colour picker droplist taller Modified Paths: -------------- trunk/FreeOrion/UI/CUIControls.cpp Modified: trunk/FreeOrion/UI/CUIControls.cpp =================================================================== --- trunk/FreeOrion/UI/CUIControls.cpp 2009-02-13 11:17:51 UTC (rev 2809) +++ trunk/FreeOrion/UI/CUIControls.cpp 2009-02-13 15:45:27 UTC (rev 2810) @@ -1066,7 +1066,7 @@ // class EmpireColorSelector /////////////////////////////////////// EmpireColorSelector::EmpireColorSelector(GG::Y h) : - CUIDropDownList(GG::X0, GG::Y0, COLOR_SELECTOR_WIDTH, h, 5 * h) + CUIDropDownList(GG::X0, GG::Y0, COLOR_SELECTOR_WIDTH, h, 12 * h) { const std::vector<GG::Clr>& colors = EmpireColors(); for (unsigned int i = 0; i < colors.size(); ++i) { |
From: <geo...@us...> - 2009-10-16 18:02:13
|
Revision: 3215 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=3215&view=rev Author: geoffthemedio Date: 2009-10-16 18:02:07 +0000 (Fri, 16 Oct 2009) Log Message: ----------- Tweaked colours of buttons marked selected / not selected. Modified Paths: -------------- trunk/FreeOrion/UI/CUIControls.cpp Modified: trunk/FreeOrion/UI/CUIControls.cpp =================================================================== --- trunk/FreeOrion/UI/CUIControls.cpp 2009-10-16 11:11:33 UTC (rev 3214) +++ trunk/FreeOrion/UI/CUIControls.cpp 2009-10-16 18:02:07 UTC (rev 3215) @@ -93,7 +93,7 @@ } CUIButton::CUIButton(GG::X x, GG::Y y, GG::X w, const std::string& str, const boost::shared_ptr<GG::Font>& font/* = boost::shared_ptr<GG::Font>()*/, - GG::Clr color/* = ClientUI::WndColor()*/, + GG::Clr color/* = ClientUI::CtrlColor()*/, GG::Clr border/* = ClientUI::CtrlBorderColor()*/, int thick/* = 2*/, GG::Clr text_color/* = ClientUI::TextColor()*/, GG::Flags<GG::WndFlag> flags/* = GG::INTERACTIVE*/) : Button(x, y, w, FontOrDefaultFont(font)->Lineskip() + 6, str, FontOrDefaultFont(font), color, text_color, flags), @@ -166,7 +166,7 @@ void CUIButton::MarkNotSelected() { - SetColor(ClientUI::WndColor()); + SetColor(ClientUI::CtrlColor()); SetBorderColor(ClientUI::CtrlBorderColor()); SetBorderThick(1); } @@ -176,6 +176,11 @@ GG::Clr colour = ClientUI::CtrlColor(); AdjustBrightness(colour, 50); SetColor(colour); + + colour = ClientUI::CtrlBorderColor(); + AdjustBrightness(colour, 50); + SetBorderColor(colour); + SetBorderThick(2); } |
From: <geo...@us...> - 2010-07-19 03:41:24
|
Revision: 3682 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=3682&view=rev Author: geoffthemedio Date: 2010-07-19 03:41:18 +0000 (Mon, 19 Jul 2010) Log Message: ----------- Fixed unused variable in CUIControls.cpp. Modified Paths: -------------- trunk/FreeOrion/UI/CUIControls.cpp Modified: trunk/FreeOrion/UI/CUIControls.cpp =================================================================== --- trunk/FreeOrion/UI/CUIControls.cpp 2010-07-19 03:40:19 UTC (rev 3681) +++ trunk/FreeOrion/UI/CUIControls.cpp 2010-07-19 03:41:18 UTC (rev 3682) @@ -1132,8 +1132,6 @@ Clear(); - const SpeciesManager& sm = GetSpeciesManager(); - for (std::vector<std::string>::const_iterator it = species_names.begin(); it != species_names.end(); ++it) { const std::string& species_name = *it; if (const Species* species = GetSpecies(species_name)) { |
From: <tz...@us...> - 2010-12-27 01:17:40
|
Revision: 3930 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=3930&view=rev Author: tzlaine Date: 2010-12-27 01:17:34 +0000 (Mon, 27 Dec 2010) Log Message: ----------- Added a min height to CUIDropDownList to prevent it from getting squeezed flat due to recent GG changes. Modified Paths: -------------- trunk/FreeOrion/UI/CUIControls.cpp Modified: trunk/FreeOrion/UI/CUIControls.cpp =================================================================== --- trunk/FreeOrion/UI/CUIControls.cpp 2010-12-26 20:55:28 UTC (rev 3929) +++ trunk/FreeOrion/UI/CUIControls.cpp 2010-12-27 01:17:34 UTC (rev 3930) @@ -646,6 +646,7 @@ m_mouse_here(false) { SetInteriorColor(interior); + SetMinSize(GG::Pt(MinSize().x, CUISimpleDropDownListRow::DEFAULT_ROW_HEIGHT)); } void CUIDropDownList::Render() |
From: <geo...@us...> - 2011-07-30 18:22:05
|
Revision: 4076 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=4076&view=rev Author: geoffthemedio Date: 2011-07-30 18:21:59 +0000 (Sat, 30 Jul 2011) Log Message: ----------- Modified SpeciesSelector to only list playable species by default. Modified Paths: -------------- trunk/FreeOrion/UI/CUIControls.cpp Modified: trunk/FreeOrion/UI/CUIControls.cpp =================================================================== --- trunk/FreeOrion/UI/CUIControls.cpp 2011-07-29 05:36:16 UTC (rev 4075) +++ trunk/FreeOrion/UI/CUIControls.cpp 2011-07-30 18:21:59 UTC (rev 4076) @@ -1116,7 +1116,7 @@ CUIDropDownList(GG::X0, GG::Y0, w, h - 8, 6 * h) { const SpeciesManager& sm = GetSpeciesManager(); - for (SpeciesManager::iterator it = sm.begin(); it != sm.end(); ++it) + for (SpeciesManager::playable_iterator it = sm.playable_begin(); it != sm.playable_end(); ++it) Insert(new SpeciesRow(it->second, w, h - 4)); if (!this->Empty()) Select(this->begin()); |
From: <geo...@us...> - 2012-07-04 17:33:39
|
Revision: 4973 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=4973&view=rev Author: geoffthemedio Date: 2012-07-04 17:33:32 +0000 (Wed, 04 Jul 2012) Log Message: ----------- Made CUIToolBar not draggable again, as I dislike how I keep accidentally moving it. Modified Paths: -------------- trunk/FreeOrion/UI/CUIControls.cpp Modified: trunk/FreeOrion/UI/CUIControls.cpp =================================================================== --- trunk/FreeOrion/UI/CUIControls.cpp 2012-07-03 06:56:53 UTC (rev 4972) +++ trunk/FreeOrion/UI/CUIControls.cpp 2012-07-04 17:33:32 UTC (rev 4973) @@ -948,7 +948,7 @@ // class CUIToolBar /////////////////////////////////////// CUIToolBar::CUIToolBar(GG::X x, GG::Y y, GG::X w, GG::Y h) : - GG::Control(x, y, w, h, GG::ONTOP | GG::INTERACTIVE | GG::DRAGABLE) + GG::Control(x, y, w, h, GG::ONTOP | GG::INTERACTIVE) {} bool CUIToolBar::InWindow(const GG::Pt& pt) const { |
From: <geo...@us...> - 2012-11-12 04:10:10
|
Revision: 5403 http://freeorion.svn.sourceforge.net/freeorion/revision/?rev=5403&view=rev Author: geoffthemedio Date: 2012-11-12 04:10:04 +0000 (Mon, 12 Nov 2012) Log Message: ----------- Modified ProductionInfoPanel to use DoubleToString and show 3 digits instead of casting RP or PP amounts to integers, which was confusing when fractional points remained unspent but the indicator was showing 0. Modified Paths: -------------- trunk/FreeOrion/UI/CUIControls.cpp Modified: trunk/FreeOrion/UI/CUIControls.cpp =================================================================== --- trunk/FreeOrion/UI/CUIControls.cpp 2012-11-12 01:06:02 UTC (rev 5402) +++ trunk/FreeOrion/UI/CUIControls.cpp 2012-11-12 04:10:04 UTC (rev 5403) @@ -1303,10 +1303,10 @@ double points_to_underfunded_projects, int queue_size) { double wasted_points = total_queue_cost < total_points ? total_points - total_queue_cost : 0.0; - *m_total_points << static_cast<int>(total_points); - *m_wasted_points << static_cast<int>(wasted_points); + *m_total_points << DoubleToString(total_points, 3, false); + *m_wasted_points << DoubleToString(wasted_points, 3, false); *m_projects_in_progress << projects_in_progress; - *m_points_to_underfunded_projects << static_cast<int>(points_to_underfunded_projects); + *m_points_to_underfunded_projects << DoubleToString(points_to_underfunded_projects, 3, false); *m_projects_in_queue << queue_size; } |
From: <mar...@us...> - 2014-08-01 17:32:42
|
Revision: 7344 http://sourceforge.net/p/freeorion/code/7344 Author: marcel_metz Date: 2014-08-01 17:32:40 +0000 (Fri, 01 Aug 2014) Log Message: ----------- Fixed shadowed text control rendering being one pixel off. Modified Paths: -------------- trunk/FreeOrion/UI/CUIControls.cpp Modified: trunk/FreeOrion/UI/CUIControls.cpp =================================================================== --- trunk/FreeOrion/UI/CUIControls.cpp 2014-08-01 17:32:09 UTC (rev 7343) +++ trunk/FreeOrion/UI/CUIControls.cpp 2014-08-01 17:32:40 UTC (rev 7344) @@ -1438,7 +1438,7 @@ GG::Clr color, GG::Flags<GG::TextFormat> format) : GG::Control(GG::X0, GG::Y0, GG::X1, GG::Y1, GG::NO_WND_FLAGS), shadow_text(new GG::TextControl(GG::X0, GG::Y0, GG::X1, GG::Y1, RemoveRGB(str), font, GG::CLR_BLACK, format, GG::NO_WND_FLAGS)), - main_text(new GG::TextControl(GG::X0, GG::Y1, GG::X1, GG::Y1, str, font, color, format, GG::NO_WND_FLAGS)) + main_text(new GG::TextControl(GG::X0, GG::Y0, GG::X1, GG::Y1, str, font, color, format, GG::NO_WND_FLAGS)) { Resize(main_text->Size()); AttachChild(shadow_text); |
From: <geo...@us...> - 2014-08-14 22:00:30
|
Revision: 7457 http://sourceforge.net/p/freeorion/code/7457 Author: geoffthemedio Date: 2014-08-14 22:00:22 +0000 (Thu, 14 Aug 2014) Log Message: ----------- Small patch by Mitten.O fixing links in MultiEdit link text. Modified Paths: -------------- trunk/FreeOrion/UI/CUIControls.cpp Modified: trunk/FreeOrion/UI/CUIControls.cpp =================================================================== --- trunk/FreeOrion/UI/CUIControls.cpp 2014-08-14 21:41:22 UTC (rev 7456) +++ trunk/FreeOrion/UI/CUIControls.cpp 2014-08-14 22:00:22 UTC (rev 7457) @@ -811,6 +811,9 @@ FindLinks(); MarkLinks(); m_already_setting_text_so_dont_link = false; + // The scrollbar shenanigans apparently also confuse the link locations + // so we refresh them here. + LocateLinks(); return; } else { CUIMultiEdit::SetText(str); |
From: <mar...@us...> - 2014-08-22 21:28:00
|
Revision: 7564 http://sourceforge.net/p/freeorion/code/7564 Author: marcel_metz Date: 2014-08-22 21:27:51 +0000 (Fri, 22 Aug 2014) Log Message: ----------- Corrected invalid layout calculation for ProductionInfoPanel. Modified Paths: -------------- trunk/FreeOrion/UI/CUIControls.cpp Modified: trunk/FreeOrion/UI/CUIControls.cpp =================================================================== --- trunk/FreeOrion/UI/CUIControls.cpp 2014-08-22 19:03:07 UTC (rev 7563) +++ trunk/FreeOrion/UI/CUIControls.cpp 2014-08-22 21:27:51 UTC (rev 7564) @@ -1334,7 +1334,7 @@ } GG::Pt ProductionInfoPanel::MinUsableSize() const { - return GG::Pt(Width(), m_projects_in_queue_label->Bottom() + 5); + return GG::Pt(Width(), m_projects_in_queue_label->RelativeLowerRight().y + 5); } void ProductionInfoPanel::Render() { @@ -1370,7 +1370,6 @@ } void ProductionInfoPanel::DoLayout() { - const int RESEARCH_TITLE_PTS = ClientUI::Pts() + 10; const int STAT_TEXT_PTS = ClientUI::Pts(); const int CENTERLINE_GAP = 4; const GG::X LABEL_TEXT_WIDTH = (Width() - 4 - CENTERLINE_GAP) * 2 / 3; @@ -1382,34 +1381,45 @@ const GG::Pt LABEL_TEXT_SIZE(LABEL_TEXT_WIDTH, GG::Y(STAT_TEXT_PTS + 4)); const GG::Pt VALUE_TEXT_SIZE(VALUE_TEXT_WIDTH, GG::Y(STAT_TEXT_PTS + 4)); const GG::Pt P_LABEL_SIZE(Width() - 2 - 5 - P_LABEL_X, GG::Y(STAT_TEXT_PTS + 4)); + GG::Y row_offset(4); - m_title->MoveTo(GG::Pt(GG::X(2), GG::Y(4))); - m_title->Resize(GG::Pt(Width() - 4, GG::Y(RESEARCH_TITLE_PTS + 4))); - m_total_points_label->MoveTo(GG::Pt(LEFT_TEXT_X, m_title->Bottom() + VERTICAL_SECTION_GAP + 4)); + m_title->MoveTo(GG::Pt(GG::X(2), row_offset)); + m_title->Resize(GG::Pt(Width() - 4, m_title->MinUsableSize().y)); + + row_offset += m_title->MinUsableSize().y + VERTICAL_SECTION_GAP + 4; + m_total_points_label->MoveTo(GG::Pt(LEFT_TEXT_X, row_offset)); m_total_points_label->Resize(LABEL_TEXT_SIZE); - m_total_points->MoveTo(GG::Pt(RIGHT_TEXT_X, m_title->Bottom() + VERTICAL_SECTION_GAP + 4)); + m_total_points->MoveTo(GG::Pt(RIGHT_TEXT_X, row_offset)); m_total_points->Resize(VALUE_TEXT_SIZE); - m_total_points_P_label->MoveTo(GG::Pt(P_LABEL_X, m_title->Bottom() + VERTICAL_SECTION_GAP + 4)); + m_total_points_P_label->MoveTo(GG::Pt(P_LABEL_X, row_offset)); m_total_points_P_label->Resize(P_LABEL_SIZE); - m_wasted_points_label->MoveTo(GG::Pt(LEFT_TEXT_X, m_total_points_label->Bottom())); + + row_offset += m_total_points_label->Height(); + m_wasted_points_label->MoveTo(GG::Pt(LEFT_TEXT_X, row_offset)); m_wasted_points_label->Resize(LABEL_TEXT_SIZE); - m_wasted_points->MoveTo(GG::Pt(RIGHT_TEXT_X, m_total_points_label->Bottom())); + m_wasted_points->MoveTo(GG::Pt(RIGHT_TEXT_X, row_offset)); m_wasted_points->Resize(VALUE_TEXT_SIZE); - m_wasted_points_P_label->MoveTo(GG::Pt(P_LABEL_X, m_total_points_label->Bottom())); + m_wasted_points_P_label->MoveTo(GG::Pt(P_LABEL_X, row_offset)); m_wasted_points_P_label->Resize(P_LABEL_SIZE); - m_projects_in_progress_label->MoveTo(GG::Pt(LEFT_TEXT_X, m_wasted_points_label->Bottom() + VERTICAL_SECTION_GAP + 4)); + + row_offset += m_wasted_points_label->Height() + VERTICAL_SECTION_GAP + 4; + m_projects_in_progress_label->MoveTo(GG::Pt(LEFT_TEXT_X, row_offset)); m_projects_in_progress_label->Resize(LABEL_TEXT_SIZE); - m_projects_in_progress->MoveTo(GG::Pt(RIGHT_TEXT_X, m_wasted_points_label->Bottom() + VERTICAL_SECTION_GAP + 4)); + m_projects_in_progress->MoveTo(GG::Pt(RIGHT_TEXT_X, row_offset)); m_projects_in_progress->Resize(VALUE_TEXT_SIZE); - m_points_to_underfunded_projects_label->MoveTo(GG::Pt(LEFT_TEXT_X, m_projects_in_progress_label->Bottom())); + + row_offset += m_projects_in_progress_label->Height(); + m_points_to_underfunded_projects_label->MoveTo(GG::Pt(LEFT_TEXT_X, row_offset)); m_points_to_underfunded_projects_label->Resize(LABEL_TEXT_SIZE); - m_points_to_underfunded_projects->MoveTo(GG::Pt(RIGHT_TEXT_X, m_projects_in_progress_label->Bottom())); + m_points_to_underfunded_projects->MoveTo(GG::Pt(RIGHT_TEXT_X, row_offset)); m_points_to_underfunded_projects->Resize(VALUE_TEXT_SIZE); - m_points_to_underfunded_projects_P_label->MoveTo(GG::Pt(P_LABEL_X, m_projects_in_progress_label->Bottom())); + m_points_to_underfunded_projects_P_label->MoveTo(GG::Pt(P_LABEL_X, row_offset)); m_points_to_underfunded_projects_P_label->Resize(P_LABEL_SIZE); - m_projects_in_queue_label->MoveTo(GG::Pt(LEFT_TEXT_X, m_points_to_underfunded_projects_label->Bottom())); + + row_offset += m_points_to_underfunded_projects_label->Height(); + m_projects_in_queue_label->MoveTo(GG::Pt(LEFT_TEXT_X, row_offset)); m_projects_in_queue_label->Resize(LABEL_TEXT_SIZE); - m_projects_in_queue->MoveTo(GG::Pt(RIGHT_TEXT_X, m_points_to_underfunded_projects_label->Bottom())); + m_projects_in_queue->MoveTo(GG::Pt(RIGHT_TEXT_X, row_offset)); m_projects_in_queue->Resize(VALUE_TEXT_SIZE); } |
From: <geo...@us...> - 2014-08-24 06:02:22
|
Revision: 7582 http://sourceforge.net/p/freeorion/code/7582 Author: geoffthemedio Date: 2014-08-24 06:02:12 +0000 (Sun, 24 Aug 2014) Log Message: ----------- grooming Modified Paths: -------------- trunk/FreeOrion/UI/CUIControls.cpp Modified: trunk/FreeOrion/UI/CUIControls.cpp =================================================================== --- trunk/FreeOrion/UI/CUIControls.cpp 2014-08-23 21:51:20 UTC (rev 7581) +++ trunk/FreeOrion/UI/CUIControls.cpp 2014-08-24 06:02:12 UTC (rev 7582) @@ -71,14 +71,16 @@ } CUIButton::CUIButton(const std::string& str) : - Button(GG::X0, GG::Y0, GG::X1, ClientUI::GetFont()->Lineskip() + 6, str, ClientUI::GetFont(), ClientUI::CtrlColor(), ClientUI::TextColor(), GG::INTERACTIVE), + Button(GG::X0, GG::Y0, GG::X1, ClientUI::GetFont()->Lineskip() + 6, str, + ClientUI::GetFont(), ClientUI::CtrlColor(), ClientUI::TextColor(), GG::INTERACTIVE), m_border_color(ClientUI::CtrlBorderColor()), m_border_thick(1) { GG::Connect(LeftClickedSignal, &PlayButtonClickSound, -1); } - -CUIButton::CUIButton(const GG::SubTexture& unpressed, const GG::SubTexture& pressed, const GG::SubTexture& rollover) : - Button(GG::X0, GG::Y0, GG::X1, GG::Y1, "", ClientUI::GetFont(), GG::CLR_WHITE, GG::CLR_ZERO, GG::INTERACTIVE), +CUIButton::CUIButton(const GG::SubTexture& unpressed, const GG::SubTexture& pressed, + const GG::SubTexture& rollover) : + Button(GG::X0, GG::Y0, GG::X1, GG::Y1, "", ClientUI::GetFont(), + GG::CLR_WHITE, GG::CLR_ZERO, GG::INTERACTIVE), m_border_color(ClientUI::CtrlBorderColor()), m_border_thick(1) { @@ -275,8 +277,11 @@ /////////////////////////////////////// // class CUIStateButton /////////////////////////////////////// -CUIStateButton::CUIStateButton(const std::string& str, GG::Flags<GG::TextFormat> format, GG::StateButtonStyle style/* = GG::SBSTYLE_3D_CHECKBOX*/) : - StateButton(GG::X0, GG::Y0, GG::X1, GG::Y1, str, ClientUI::GetFont(), format, ClientUI::StateButtonColor(), ClientUI::TextColor(), GG::CLR_ZERO, style, GG::INTERACTIVE), +CUIStateButton::CUIStateButton(const std::string& str, GG::Flags<GG::TextFormat> format, + GG::StateButtonStyle style/* = GG::SBSTYLE_3D_CHECKBOX*/) : + StateButton(GG::X0, GG::Y0, GG::X1, GG::Y1, str, ClientUI::GetFont(), format, + ClientUI::StateButtonColor(), ClientUI::TextColor(), GG::CLR_ZERO, + style, GG::INTERACTIVE), m_border_color(ClientUI::CtrlBorderColor()), m_mouse_here(false) { @@ -453,7 +458,7 @@ /////////////////////////////////////// // class CUIScroll::ScrollTab /////////////////////////////////////// -CUIScroll::ScrollTab::ScrollTab(GG::Orientation orientation, int scroll_width, GG::Clr color, +CUIScroll::ScrollTab::ScrollTab(GG::Orientation orientation, int scroll_width, GG::Clr color, GG::Clr border_color) : Button(GG::X(orientation == GG::VERTICAL ? 0 : 2), GG::Y(orientation == GG::VERTICAL ? 2 : 0), @@ -673,6 +678,7 @@ void CUIDropDownList::EnableDropArrow() { m_render_drop_arrow = true; } + /////////////////////////////////////// // class CUIEdit /////////////////////////////////////// @@ -708,6 +714,7 @@ SetColor(color); } + /////////////////////////////////////// // class CUIMultiEdit /////////////////////////////////////// @@ -1024,6 +1031,7 @@ GG::FlatRectangle(ul, lr, ClientUI::WndColor(), ClientUI::WndOuterBorderColor(), 1); } + /////////////////////////////////////// // class SpeciesSelector /////////////////////////////////////// @@ -1143,6 +1151,7 @@ SpeciesChangedSignal(EMPTY_STRING); } + /////////////////////////////////////// // class EmpireColorSelector /////////////////////////////////////// @@ -1202,6 +1211,7 @@ Logger().errorStream() << "EmpireColorSelector::SelectionChanged had trouble getting colour from row!"; } + /////////////////////////////////////// // class ColorSelector /////////////////////////////////////// @@ -1256,6 +1266,7 @@ } } + /////////////////////////////////////// // class FileDlg /////////////////////////////////////// @@ -1282,6 +1293,7 @@ SetThreeButtonDlgCancelString(UserString("CANCEL")); } + ////////////////////////////////////////////////// // ProductionInfoPanel ////////////////////////////////////////////////// @@ -1453,6 +1465,7 @@ CORNER_RADIUS, false, false, false, true, fill); } + ////////////////////////////////////////////////// // MultiTurnProgressBar ////////////////////////////////////////////////// @@ -1498,6 +1511,7 @@ } } + ////////////////////////////////////////////////// // FPSIndicator ////////////////////////////////////////////////// @@ -1518,6 +1532,7 @@ void FPSIndicator::UpdateEnabled() { m_enabled = GetOptionsDB().Get<bool>("show-fps"); } + ////////////////////////////////////////////////// // ShadowedTextControl ////////////////////////////////////////////////// |