Fix menu text centering

LB-- · LB-- · commit e31ba94a94aa · 2015-03-02T15:11:20.000-06:00
diff --git a/src/app/Button.cpp b/src/app/Button.cpp
@@ -10,6 +10,7 @@ namespace chesspp
 			button.setString(text);
 			button.setStyle(sf::Text::Bold);
 			button.setColor(sf::Color::Black);
+            recenter();
 		}
 
 		void Button::draw(sf::RenderTarget& target, sf::RenderStates states) const
diff --git a/src/app/Button.hpp b/src/app/Button.hpp
@@ -15,6 +15,7 @@ namespace chesspp
 		class Button : public sf::Drawable
 		{
 			sf::Text button;
+            sf::Vector2f center;
 			/**
 			 * \brief
 			 * Overriden sf::Drawable::draw method to provide to custom rendering behavior
@@ -24,6 +25,11 @@ namespace chesspp
 			 */
 			virtual void draw(sf::RenderTarget& target, sf::RenderStates states) const override;
 
+            void recenter() noexcept
+            {
+                button.setPosition(center.x - (button.getLocalBounds().width/2), center.y - (button.getLocalBounds().height/2));
+            }
+
 		public:
 			/**
 			 * \brief
@@ -54,7 +60,8 @@ namespace chesspp
 			 */
 			void setPosition(int x, int y)
 			{
-				button.setPosition(x,y);
+				center = sf::Vector2f{sf::Vector2i{x, y}};
+                recenter();
 			}
 			/**
 			 * \brief
@@ -64,7 +71,8 @@ namespace chesspp
 			 */
 			void setPosition(sf::Vector2f &pos)
 			{
-				button.setPosition(pos);
+				center = pos;
+                recenter();
 			}
 			/**
 			 * \brief
@@ -75,6 +83,7 @@ namespace chesspp
 			void setText(const std::string &text)
 			{
 				button.setString(text);
+                recenter();
 			}
 			/**
 			 * \brief
@@ -95,6 +104,7 @@ namespace chesspp
 			void setFont(const sf::Font &font)
 			{
 				button.setFont(font);
+                recenter();
 			}
 			/**
 			 * \brief
@@ -115,7 +125,7 @@ namespace chesspp
 			 */
 			sf::Vector2f getPosition()
 			{
-				return button.getPosition();
+				return center;
 			}
 			/**
 			 * \brief
@@ -135,6 +145,7 @@ namespace chesspp
 			 */
 			bool contains(int x, int y)
 			{
+                recenter();
 				return button.getGlobalBounds().contains(x,y);
 			}
 
diff --git a/src/app/StartMenuState.cpp b/src/app/StartMenuState.cpp
@@ -21,13 +21,13 @@ namespace chesspp
         , quit_text {"Quit", 75}
         {
             //Sets position at centered horizontally, down 10% vertically
-            logo.setPosition      (((display.getSize().x/2) - (logo.getLocalBounds()      .width/2)), (display.getSize().y*0.10));
+            logo.setPosition((display.getSize().x/2) - (logo.getLocalBounds().width/2), display.getSize().y*0.10);
 
-            //Set up text -- No idea why the centering stopped working correctly, so I had to manually adjust for now.
-            start_text.setPosition(((display.getSize().x/2) - (start_text.getText().getLocalBounds().width/2) - 125), (display.getSize().y*0.35));
+            //Set up text
+            start_text.setPosition(display.getSize().x/2, display.getSize().y*0.35);
             start_text.setFont(font);
 
-            quit_text.setPosition (((display.getSize().x/2) - (quit_text.getText().getLocalBounds() .width/2) - 100), (display.getSize().y*0.47));
+            quit_text.setPosition (display.getSize().x/2, display.getSize().y*0.47);
             quit_text.setFont(font);
 
             //Register buttons with button_manager

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ namespace chesspp`
`10`	`10`	`button.setString(text);`
`11`	`11`	`button.setStyle(sf::Text::Bold);`
`12`	`12`	`button.setColor(sf::Color::Black);`
	`13`	`+ recenter();`
`13`	`14`	`}`
`14`	`15`
`15`	`16`	`void Button::draw(sf::RenderTarget& target, sf::RenderStates states) const`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ namespace chesspp`
`15`	`15`	`class Button : public sf::Drawable`
`16`	`16`	`{`
`17`	`17`	`sf::Text button;`
	`18`	`+ sf::Vector2f center;`
`18`	`19`	`/**`
`19`	`20`	`* \brief`
`20`	`21`	`* Overriden sf::Drawable::draw method to provide to custom rendering behavior`
`@@ -24,6 +25,11 @@ namespace chesspp`
`24`	`25`	`*/`
`25`	`26`	`virtual void draw(sf::RenderTarget& target, sf::RenderStates states) const override;`
`26`	`27`
	`28`	`+ void recenter() noexcept`
	`29`	`+ {`
	`30`	`+ button.setPosition(center.x - (button.getLocalBounds().width/2), center.y - (button.getLocalBounds().height/2));`
	`31`	`+ }`
	`32`	`+`
`27`	`33`	`public:`
`28`	`34`	`/**`
`29`	`35`	`* \brief`
`@@ -54,7 +60,8 @@ namespace chesspp`
`54`	`60`	`*/`
`55`	`61`	`void setPosition(int x, int y)`
`56`	`62`	`{`
`57`		`- button.setPosition(x,y);`
	`63`	`+ center = sf::Vector2f{sf::Vector2i{x, y}};`
	`64`	`+ recenter();`
`58`	`65`	`}`
`59`	`66`	`/**`
`60`	`67`	`* \brief`
`@@ -64,7 +71,8 @@ namespace chesspp`
`64`	`71`	`*/`
`65`	`72`	`void setPosition(sf::Vector2f &pos)`
`66`	`73`	`{`
`67`		`- button.setPosition(pos);`
	`74`	`+ center = pos;`
	`75`	`+ recenter();`
`68`	`76`	`}`
`69`	`77`	`/**`
`70`	`78`	`* \brief`
`@@ -75,6 +83,7 @@ namespace chesspp`
`75`	`83`	`void setText(const std::string &text)`
`76`	`84`	`{`
`77`	`85`	`button.setString(text);`
	`86`	`+ recenter();`
`78`	`87`	`}`
`79`	`88`	`/**`
`80`	`89`	`* \brief`
`@@ -95,6 +104,7 @@ namespace chesspp`
`95`	`104`	`void setFont(const sf::Font &font)`
`96`	`105`	`{`
`97`	`106`	`button.setFont(font);`
	`107`	`+ recenter();`
`98`	`108`	`}`
`99`	`109`	`/**`
`100`	`110`	`* \brief`
`@@ -115,7 +125,7 @@ namespace chesspp`
`115`	`125`	`*/`
`116`	`126`	`sf::Vector2f getPosition()`
`117`	`127`	`{`
`118`		`- return button.getPosition();`
	`128`	`+ return center;`
`119`	`129`	`}`
`120`	`130`	`/**`
`121`	`131`	`* \brief`
`@@ -135,6 +145,7 @@ namespace chesspp`
`135`	`145`	`*/`
`136`	`146`	`bool contains(int x, int y)`
`137`	`147`	`{`
	`148`	`+ recenter();`
`138`	`149`	`return button.getGlobalBounds().contains(x,y);`
`139`	`150`	`}`
`140`	`151`