RPJosh
/
Pocketbook-Nextcloud-Client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make loginview easier readable

pull/23/head
JuanJakobo 2020-12-01 23:01:35 +01:00
parent fffe0b28aa
commit 73adc742fd
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ui/loginView.cpp
View File

@ -59,13 +59,13 @@ void LoginView::keyboardHandler(char *text)
if (s.empty()) if (s.empty())
return; return;
if (_keyboardValue == 1) if (_target == KeyboardTarget::IURL)
{ {
_url = s.c_str(); _url = s.c_str();
FillAreaRect(&_urlButton, WHITE); FillAreaRect(&_urlButton, WHITE);
DrawTextRect2(&_urlButton, s.c_str()); DrawTextRect2(&_urlButton, s.c_str());
} }
else if (_keyboardValue == 2) else if (_target == KeyboardTarget::IUSERNAME)
{ {
_username = s.c_str(); _username = s.c_str();
FillAreaRect(&_usernameButton, WHITE); FillAreaRect(&_usernameButton, WHITE);
@ -92,7 +92,7 @@ int LoginView::logginClicked(int x, int y)
if (IsInRect(x, y, &_urlButton)) if (IsInRect(x, y, &_urlButton))
{ {
_keyboardValue = 1; _target = KeyboardTarget::IURL;
if(!_url.empty()) if(!_url.empty())
_temp = _url; _temp = _url;
_temp.resize(KEYBOARD_STRING_LENGHT); _temp.resize(KEYBOARD_STRING_LENGHT);
@ -102,7 +102,7 @@ int LoginView::logginClicked(int x, int y)
else if (IsInRect(x, y, &_usernameButton)) else if (IsInRect(x, y, &_usernameButton))
{ {
_keyboardValue = 2; _target = KeyboardTarget::IUSERNAME;
if(!_username.empty()) if(!_username.empty())
_temp = _username; _temp = _username;
_temp.resize(KEYBOARD_STRING_LENGHT); _temp.resize(KEYBOARD_STRING_LENGHT);
@ -111,7 +111,7 @@ int LoginView::logginClicked(int x, int y)
} }
else if (IsInRect(x, y, &_passwordButton)) else if (IsInRect(x, y, &_passwordButton))
{ {
_keyboardValue = 3; _target = KeyboardTarget::IPASSWORD;
_temp.resize(KEYBOARD_STRING_LENGHT); _temp.resize(KEYBOARD_STRING_LENGHT);
OpenKeyboard("Password",&_temp[0], KEYBOARD_STRING_LENGHT, KBD_PASSWORD, &keyboardHandlerStatic); OpenKeyboard("Password",&_temp[0], KEYBOARD_STRING_LENGHT, KBD_PASSWORD, &keyboardHandlerStatic);

9
src/ui/loginView.h
View File

@ -16,6 +16,13 @@
using std::string; using std::string;
enum KeyboardTarget
{
IURL,
IUSERNAME,
IPASSWORD
};
const int KEYBOARD_STRING_LENGHT = 80; const int KEYBOARD_STRING_LENGHT = 80;
class LoginView class LoginView
@ -37,7 +44,7 @@ private:
irect _loginButton; irect _loginButton;
irect _usernameButton; irect _usernameButton;
irect _passwordButton; irect _passwordButton;
int _keyboardValue; KeyboardTarget _target;
string _username; string _username;
string _password; string _password;
string _url; string _url;