commit d0739659

Poul Sander · 2020-06-01 19:17
d0739659143b42bcca6c5c2b1a27458660e3f66b patch · browse files
parent eb4cc88e9b252bb4768539c52e0f639efd52104e

Now only selects a new char if the mouse moves

Changed files

M	source/code/DialogBox.cpp before
M	source/code/DialogBox.hpp before

diff --git a/source/code/DialogBox.cpp b/source/code/DialogBox.cpp index e0039b6..bc113aa 100644 --- a/source/code/DialogBox.cpp +++ b/source/code/DialogBox.cpp

@@ -104,8 +104,9 @@ DialogBox::DialogBox(int x, int y, const std::string& name, const std::string& h

gamePadCharFields.emplace_back();

sago::SagoTextField& tf = gamePadCharFields.back();

setButtonFont(&globalData.spriteHolder->GetDataHolder(), tf, theChar.c_str());

- std::cout << *position << "\n";

+ std::cout << *position;

}

+ std::cout << "\n";

}

@@ -207,7 +208,6 @@ static bool isGamePadREvent(const SDL_Event& event) {

void DialogBox::virtualKeyboardWriteSelectedChar(ReadKeyboard *rk, const std::string& insertChar) const {

- std::cout << insertChar << " pressed\n";

if (insertChar == backspace) {

rk->emulateBackspace();

}

@@ -294,7 +294,6 @@ void DialogBox::ProcessInput(const SDL_Event& event, bool& processed) {

if (SDL_GetMouseState(nullptr,nullptr)&SDL_BUTTON(1) && bMouseUp) {

bMouseUp = false;

- std::cout << "Mouse pressed\n";

if (insideRect(x+25, y+128, 50, 250)) {

name = rk->GetString();

updated = true;

@@ -314,7 +313,7 @@ void DialogBox::ProcessInput(const SDL_Event& event, bool& processed) {

}

- if (1 /*TODO: Changed to only when mouse moves*/) {

+ if (globalData.mousex != oldmousex || globalData.mousey != oldmousey) {

for (size_t i = 0; i<gamePadCharFields.size(); ++i) {

auto topx = globalData.xsize/2-400+(i%keyboardRowLimit)*40-5;

auto topy = globalData.ysize/2+150+(i/keyboardRowLimit)*40-5;

@@ -322,6 +321,8 @@ void DialogBox::ProcessInput(const SDL_Event& event, bool& processed) {

selectedChar = i;

}

+ oldmousex = globalData.mousex;

+ oldmousey = globalData.mousey;

}

diff --git a/source/code/DialogBox.hpp b/source/code/DialogBox.hpp index c88e192..8829cf5 100644 --- a/source/code/DialogBox.hpp +++ b/source/code/DialogBox.hpp

@@ -60,15 +60,17 @@ private:

sago::SagoTextField cancelLabel;

sago::SagoTextField textField;

sago::SagoTextField cursorLabel;

- std::string alphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"

- "abcdefghijklmnopqrstuvwxyz"

- ".,:!?+_^@#%&=*" "‹›«";

const std::string leftChar = "‹";

const std::string rightChar = "›";

const std::string backspace = "«";

+ std::string alphabet = std::string(_("ABCDEFGHIJKLMNOPQRSTUVWXYZ"

+ "abcdefghijklmnopqrstuvwxyz"

+ ".,:!?+_^@#%&=*")) + leftChar + rightChar + backspace;

std::vector<std::string> gamePadChars;

std::vector<sago::SagoTextField> gamePadCharFields;

int selectedChar = 0;

+ int oldmousex = 0;

+ int oldmousey = 0;

};

#endif /* DIALOGBOX_HPP */