From: <mar...@us...> - 2014-08-20 08:50:30
|
Revision: 7519 http://sourceforge.net/p/freeorion/code/7519 Author: marcel_metz Date: 2014-08-20 08:50:21 +0000 (Wed, 20 Aug 2014) Log Message: ----------- Removed position parameters from GG::StyleFactory::New(H|V)SliderTabButton. Modified Paths: -------------- trunk/FreeOrion/GG/GG/Slider.h trunk/FreeOrion/GG/GG/StyleFactory.h trunk/FreeOrion/GG/src/StyleFactory.cpp trunk/FreeOrion/UI/CUIStyle.cpp trunk/FreeOrion/UI/CUIStyle.h Modified: trunk/FreeOrion/GG/GG/Slider.h =================================================================== --- trunk/FreeOrion/GG/GG/Slider.h 2014-08-20 07:16:51 UTC (rev 7518) +++ trunk/FreeOrion/GG/GG/Slider.h 2014-08-20 08:50:21 UTC (rev 7519) @@ -174,8 +174,8 @@ m_line_style(style), m_tab_drag_offset(-1), m_tab(m_orientation == VERTICAL ? - GetStyleFactory()->NewVSliderTabButton(X0, Y0, Width(), Y(m_tab_width), "", boost::shared_ptr<Font>(), color) : - GetStyleFactory()->NewHSliderTabButton(X0, Y0, X(m_tab_width), Height(), "", boost::shared_ptr<Font>(), color)), + GetStyleFactory()->NewVSliderTabButton("", boost::shared_ptr<Font>(), color) : + GetStyleFactory()->NewHSliderTabButton("", boost::shared_ptr<Font>(), color)), m_dragging_tab(false) { Control::SetColor(color); Modified: trunk/FreeOrion/GG/GG/StyleFactory.h =================================================================== --- trunk/FreeOrion/GG/GG/StyleFactory.h 2014-08-20 07:16:51 UTC (rev 7518) +++ trunk/FreeOrion/GG/GG/StyleFactory.h 2014-08-20 08:50:21 UTC (rev 7519) @@ -183,12 +183,12 @@ Flags<WndFlag> flags = INTERACTIVE) const; /** Returns a new tab Button, to be used in a vertical Slider. */ - virtual Button* NewVSliderTabButton(X x, Y y, X w, Y h, const std::string& str, + virtual Button* NewVSliderTabButton(const std::string& str, const boost::shared_ptr<Font>& font, Clr color, Clr text_color = CLR_BLACK, Flags<WndFlag> flags = INTERACTIVE) const; /** Returns a new tab Button, to be used in a horizontal Slider. */ - virtual Button* NewHSliderTabButton(X x, Y y, X w, Y h, const std::string& str, + virtual Button* NewHSliderTabButton(const std::string& str, const boost::shared_ptr<Font>& font, Clr color, Clr text_color = CLR_BLACK, Flags<WndFlag> flags = INTERACTIVE) const; Modified: trunk/FreeOrion/GG/src/StyleFactory.cpp =================================================================== --- trunk/FreeOrion/GG/src/StyleFactory.cpp 2014-08-20 07:16:51 UTC (rev 7518) +++ trunk/FreeOrion/GG/src/StyleFactory.cpp 2014-08-20 08:50:21 UTC (rev 7519) @@ -170,15 +170,15 @@ Flags<WndFlag> flags/* = INTERACTIVE*/) const { return NewButton(GG::X0, GG::Y0, GG::X1, GG::Y1, str, font, color, text_color, flags); } -Button* StyleFactory::NewVSliderTabButton(X x, Y y, X w, Y h, const std::string& str, +Button* StyleFactory::NewVSliderTabButton(const std::string& str, const boost::shared_ptr<Font>& font, Clr color, Clr text_color/* = CLR_BLACK*/, Flags<WndFlag> flags/* = INTERACTIVE*/) const -{ return NewButton(x, y, w, h, str, font, color, text_color, flags); } +{ return NewButton(X0, Y0, X1, Y1, str, font, color, text_color, flags); } -Button* StyleFactory::NewHSliderTabButton(X x, Y y, X w, Y h, const std::string& str, +Button* StyleFactory::NewHSliderTabButton(const std::string& str, const boost::shared_ptr<Font>& font, Clr color, Clr text_color/* = CLR_BLACK*/, Flags<WndFlag> flags/* = INTERACTIVE*/) const -{ return NewButton(x, y, w, h, str, font, color, text_color, flags); } +{ return NewButton(X0, Y0, X1, Y1, str, font, color, text_color, flags); } Button* StyleFactory::NewSpinIncrButton(const std::string& str, const boost::shared_ptr<Font>& font, Clr color, Clr text_color/* = CLR_BLACK*/, Modified: trunk/FreeOrion/UI/CUIStyle.cpp =================================================================== --- trunk/FreeOrion/UI/CUIStyle.cpp 2014-08-20 07:16:51 UTC (rev 7518) +++ trunk/FreeOrion/UI/CUIStyle.cpp 2014-08-20 08:50:21 UTC (rev 7519) @@ -77,15 +77,15 @@ GG::Flags<GG::WndFlag> flags/* = GG::INTERACTIVE*/) const { return new CUIScroll::ScrollTab(GG::HORIZONTAL, 1, (color == GG::CLR_ZERO) ? ClientUI::CtrlColor() : color, ClientUI::CtrlBorderColor()); } -GG::Button* CUIStyle::NewVSliderTabButton(GG::X x, GG::Y y, GG::X w, GG::Y h, const std::string& str, +GG::Button* CUIStyle::NewVSliderTabButton(const std::string& str, const boost::shared_ptr<GG::Font>& font, GG::Clr color, GG::Clr text_color/* = GG::CLR_BLACK*/, GG::Flags<GG::WndFlag> flags/* = GG::INTERACTIVE*/) const -{ return new CUIScroll::ScrollTab(GG::VERTICAL, Value(w), ClientUI::CtrlColor(), ClientUI::CtrlBorderColor()); } +{ return new CUIScroll::ScrollTab(GG::VERTICAL, 0, ClientUI::CtrlColor(), ClientUI::CtrlBorderColor()); } -GG::Button* CUIStyle::NewHSliderTabButton(GG::X x, GG::Y y, GG::X w, GG::Y h, const std::string& str, +GG::Button* CUIStyle::NewHSliderTabButton(const std::string& str, const boost::shared_ptr<GG::Font>& font, GG::Clr color, GG::Clr text_color/* = GG::CLR_BLACK*/, GG::Flags<GG::WndFlag> flags/* = GG::INTERACTIVE*/) const -{ return new CUIScroll::ScrollTab(GG::HORIZONTAL, Value(h), ClientUI::CtrlColor(), ClientUI::CtrlBorderColor()); } +{ return new CUIScroll::ScrollTab(GG::HORIZONTAL, 0, ClientUI::CtrlColor(), ClientUI::CtrlBorderColor()); } GG::Button* CUIStyle::NewSpinIncrButton(const std::string& str, const boost::shared_ptr<GG::Font>& font, GG::Clr color, GG::Clr text_color/* = GG::CLR_BLACK*/, Modified: trunk/FreeOrion/UI/CUIStyle.h =================================================================== --- trunk/FreeOrion/UI/CUIStyle.h 2014-08-20 07:16:51 UTC (rev 7518) +++ trunk/FreeOrion/UI/CUIStyle.h 2014-08-20 08:50:21 UTC (rev 7519) @@ -57,11 +57,11 @@ const boost::shared_ptr<GG::Font>& font, GG::Clr color, GG::Clr text_color = GG::CLR_BLACK, GG::Flags<GG::WndFlag> flags = GG::INTERACTIVE) const; - virtual GG::Button* NewVSliderTabButton(GG::X x, GG::Y y, GG::X w, GG::Y h, const std::string& str, + virtual GG::Button* NewVSliderTabButton(const std::string& str, const boost::shared_ptr<GG::Font>& font, GG::Clr color, GG::Clr text_color = GG::CLR_BLACK, GG::Flags<GG::WndFlag> flags = GG::INTERACTIVE) const; - virtual GG::Button* NewHSliderTabButton(GG::X x, GG::Y y, GG::X w, GG::Y h, const std::string& str, + virtual GG::Button* NewHSliderTabButton(const std::string& str, const boost::shared_ptr<GG::Font>& font, GG::Clr color, GG::Clr text_color = GG::CLR_BLACK, GG::Flags<GG::WndFlag> flags = GG::INTERACTIVE) const; |