[TextInput] Fixed background. [InterfaceState] Added setting to be ab…

…le to not display the background.
Unarelith · Feb 20, 2020 · d208a0c · d208a0c
1 parent 836e92e
commit d208a0c
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 4 deletions.
diff --git a/client/include/gui/TextInput.hpp b/client/include/gui/TextInput.hpp
@@ -34,16 +34,20 @@ class TextInput : public gk::Drawable, public gk::Transformable {
 
 		void onEvent(const SDL_Event &event);
 
+		void setBackgroundColor(const gk::Color &color) { m_background.setFillColor(color); }
+		void setBackgroundSize(unsigned int width, unsigned int height) { m_background.setSize(width, height); }
+
+		void setPadding(int x, int y) { m_text.setPosition(x, y); }
+
 	private:
 		void draw(gk::RenderTarget &target, gk::RenderStates states) const override;
 
 		Text m_text;
 		std::string m_content;
+		char m_cursor = '_';
 
 		u16 m_characterLimit = 0;
 
-		char m_cursor = '_';
-
 		gk::RectangleShape m_background;
 };
 

diff --git a/client/include/states/InterfaceState.hpp b/client/include/states/InterfaceState.hpp
@@ -37,6 +37,8 @@ class InterfaceState : public gk::ApplicationState {
 
 		void prepareDraw(gk::RenderTarget &target, gk::RenderStates &states) const;
 
+		bool m_drawBackground = true;
+
 	private:
 		gk::Shader m_shader;
 		// gk::View m_view;

diff --git a/client/source/gui/TextInput.cpp b/client/source/gui/TextInput.cpp
@@ -20,6 +20,8 @@
  *
  * =====================================================================================
  */
+#include <gk/resource/ResourceHandler.hpp>
+
 #include "TextInput.hpp"
 
 TextInput::TextInput() {
@@ -48,7 +50,7 @@ void TextInput::onEvent(const SDL_Event &event) {
 void TextInput::draw(gk::RenderTarget &target, gk::RenderStates states) const {
 	states.transform *= getTransform();
 
-	target.draw(m_text, states);
 	target.draw(m_background, states);
+	target.draw(m_text, states);
 }
 
diff --git a/client/source/states/ChatState.cpp b/client/source/states/ChatState.cpp
@@ -31,7 +31,12 @@ ChatState::ChatState(gk::ApplicationState *parent) : InterfaceState(parent) {
 	gk::Mouse::setCursorVisible(true);
 	gk::Mouse::resetToWindowCenter();
 
+	m_drawBackground = false;
+
 	m_textInput.setScale(Config::guiScale, Config::guiScale);
+	m_textInput.setBackgroundColor(gk::Color{0, 0, 0, 127});
+	m_textInput.setBackgroundSize(200, 10);
+	m_textInput.setPadding(1, 1);
 }
 
 void ChatState::onEvent(const SDL_Event &event) {

diff --git a/client/source/states/InterfaceState.cpp b/client/source/states/InterfaceState.cpp
@@ -67,7 +67,7 @@ void InterfaceState::prepareDraw(gk::RenderTarget &target, gk::RenderStates &sta
 
 	// target.setView(m_view);
 
-	if (m_parent)
+	if (m_parent && m_drawBackground)
 		target.draw(m_background, states);
 }