INSANEMODE/yuzu-android
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu-android.git synced 2025-06-21 10:57:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2527 from lioncash/index

Browse Source 
yuzu/{profile_select, software_keyboard}: Tidy up interface
This commit is contained in:
Zach Hilman
2019-06-05 15:30:51 -04:00
committed by GitHub
parent dd4fe0dab1 cfc9d92b38
commit 1eb979221f
5 changed files with 16 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/yuzu/applets/profile_select.cpp
View File

@ -122,21 +122,15 @@ QtProfileSelectionDialog::QtProfileSelectionDialog(QWidget* parent)
QtProfileSelectionDialog::~QtProfileSelectionDialog() = default;
void QtProfileSelectionDialog::accept() {
ok = true;
QDialog::accept();
}
void QtProfileSelectionDialog::reject() {
ok = false;
user_index = 0;
QDialog::reject();
}
bool QtProfileSelectionDialog::GetStatus() const {
return ok;
}
u32 QtProfileSelectionDialog::GetIndex() const {
int QtProfileSelectionDialog::GetIndex() const {
return user_index;
}

8
src/yuzu/applets/profile_select.h
View File

@ -30,15 +30,13 @@ public:
void accept() override;
void reject() override;
bool GetStatus() const;
u32 GetIndex() const;
int GetIndex() const;
private:
bool ok = false;
u32 user_index = 0;
void SelectUser(const QModelIndex& index);
int user_index = 0;
QVBoxLayout* layout;
QTreeView* tree_view;
QStandardItemModel* item_model;

6
src/yuzu/applets/software_keyboard.cpp
View File

@ -104,13 +104,11 @@ QtSoftwareKeyboardDialog::QtSoftwareKeyboardDialog(
QtSoftwareKeyboardDialog::~QtSoftwareKeyboardDialog() = default;
void QtSoftwareKeyboardDialog::accept() {
ok = true;
text = line_edit->text().toStdU16String();
QDialog::accept();
}
void QtSoftwareKeyboardDialog::reject() {
ok = false;
text.clear();
QDialog::reject();
}
@ -119,10 +117,6 @@ std::u16string QtSoftwareKeyboardDialog::GetText() const {
return text;
}
bool QtSoftwareKeyboardDialog::GetStatus() const {
return ok;
}
QtSoftwareKeyboard::QtSoftwareKeyboard(GMainWindow& main_window) {
connect(this, &QtSoftwareKeyboard::MainWindowGetText, &main_window,
&GMainWindow::SoftwareKeyboardGetText, Qt::QueuedConnection);

2
src/yuzu/applets/software_keyboard.h
View File

@ -36,10 +36,8 @@ public:
void reject() override;
std::u16string GetText() const;
bool GetStatus() const;
private:
bool ok = false;
std::u16string text;
QDialogButtonBox* buttons;