commit ee6837f4

sago007 · 2018-12-18 20:20
ee6837f41edfc8f24e41cdfe1c73b83fd364faf2 patch · browse files
parent 2f8b04a3602beeafefb345ac1d5cf36e496a815f

Show the console text

Changed files

M	src/saland/console/Console.cpp before
M	src/saland/console/Console.hpp before

diff --git a/src/saland/console/Console.cpp b/src/saland/console/Console.cpp index 3bb2b1d..50450e4 100644 --- a/src/saland/console/Console.cpp +++ b/src/saland/console/Console.cpp

@@ -28,6 +28,10 @@ https://github.com/sago007/saland

Console::Console() {

editPosition = editLine.begin();

SDL_StartTextInput();

+ editField.SetHolder(&globalData.spriteHolder->GetDataHolder());

+ editField.SetFont("freeserif");

+ editField.SetFontSize(20);

+ editField.SetOutline(1, {64,64,64,255});

}

Console::~Console() {

@@ -40,6 +44,8 @@ bool Console::IsActive() {

void Console::Draw(SDL_Renderer* target) {

int sideBoarder = 20;

DrawRectYellow(target, sideBoarder, 10, globalData.ysize/2, globalData.xsize - sideBoarder*2);

+ editField.SetText(editLine);

+ editField.Draw(target, sideBoarder+10, globalData.ysize/2-16);

}

void Console::putchar(const std::string& thing) {

diff --git a/src/saland/console/Console.hpp b/src/saland/console/Console.hpp index 9513ed7..d039e4a 100644 --- a/src/saland/console/Console.hpp +++ b/src/saland/console/Console.hpp

@@ -25,6 +25,7 @@ https://github.com/sago007/saland

#define CONSOLE_HPP

#include "../../sago/GameStateInterface.hpp"

+#include "../../sago/SagoTextField.hpp"

#include <string>

#include "utf8.h"

@@ -45,6 +46,7 @@ private:

bool active = true;

std::string editLine;

std::string::iterator editPosition;

+ sago::SagoTextField editField;

};

#endif /* CONSOLE_HPP */