DarkStore-3DS/DarkStore
1
0
Fork 0
mirror of https://github.com/DarkStore-3DS/DarkStore.git synced 2026-07-03 00:39:02 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Fix logic of the grid.

Browse Source
This commit is contained in:
StackZ
2020-11-03 14:53:37 +01:00
parent 466fe27d51
commit fe271afd6c
1 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/store/grid.cpp
+26 -22
View File
@@ -104,13 +104,24 @@ void StoreUtils::DrawGrid(const std::unique_ptr<Store> &store, const std::vector
*/ */
void StoreUtils::GridLogic(u32 hDown, u32 hHeld, touchPosition touch, std::unique_ptr<Store> &store, std::vector<std::unique_ptr<StoreEntry>> &entries, int &currentMode, int &lastMode, bool &fetch, int &smallDelay) { void StoreUtils::GridLogic(u32 hDown, u32 hHeld, touchPosition touch, std::unique_ptr<Store> &store, std::vector<std::unique_ptr<StoreEntry>> &entries, int &currentMode, int &lastMode, bool &fetch, int &smallDelay) {
if (store) { // Ensure, store is not a nullptr. if (store) { // Ensure, store is not a nullptr.
bool needUpdate = false;
if (hRepeat & KEY_DOWN) { if (hRepeat & KEY_DOWN) {
if (store->GetBox() > 9) { if (store->GetBox() > 9) {
if (store->GetEntry() + 5 < (int)entries.size()) { if (store->GetEntry() + 5 < (int)entries.size()) {
store->SetEntry(store->GetEntry() + 5); store->SetEntry(store->GetEntry() + 5);
needUpdate = true;
if (store->GetScreenIndx() < ((entries.size() / 5) - 2)) {
store->SetScreenIndx(store->GetScreenIndx() + 1);
}
} else {
if (store->GetEntry() < (int)entries.size() - 1) {
store->SetEntry(entries.size() - 1);
store->SetBox(10 + (store->GetEntry() % 5));
if (store->GetScreenIndx() < ((entries.size() / 5) - 2)) {
store->SetScreenIndx(store->GetScreenIndx() + 1);
}
}
} }
} else { } else {
@@ -130,7 +141,10 @@ void StoreUtils::GridLogic(u32 hDown, u32 hHeld, touchPosition touch, std::uniqu
} else { } else {
store->SetBox(10); store->SetBox(10);
store->SetEntry(store->GetEntry() + 1); store->SetEntry(store->GetEntry() + 1);
needUpdate = true;
if (store->GetScreenIndx() < ((entries.size() / 5) - 2)) {
store->SetScreenIndx(store->GetScreenIndx() + 1);
}
} }
} }
} }
@@ -144,7 +158,10 @@ void StoreUtils::GridLogic(u32 hDown, u32 hHeld, touchPosition touch, std::uniqu
} else { } else {
store->SetBox(4); store->SetBox(4);
store->SetEntry(store->GetEntry() - 1); store->SetEntry(store->GetEntry() - 1);
needUpdate = true;
if (store->GetScreenIndx() > 0) {
store->SetScreenIndx(store->GetScreenIndx() - 1);
}
} }
} }
} }
@@ -153,7 +170,10 @@ void StoreUtils::GridLogic(u32 hDown, u32 hHeld, touchPosition touch, std::uniqu
if (store->GetBox() < 5) { if (store->GetBox() < 5) {
if (store->GetEntry() > 4) { if (store->GetEntry() > 4) {
store->SetEntry(store->GetEntry() - 5); store->SetEntry(store->GetEntry() - 5);
needUpdate = true;
if (store->GetScreenIndx() > 0) {
store->SetScreenIndx(store->GetScreenIndx() - 1);
}
} }
} else { } else {
@@ -168,21 +188,5 @@ void StoreUtils::GridLogic(u32 hDown, u32 hHeld, touchPosition touch, std::uniqu
lastMode = currentMode; lastMode = currentMode;
currentMode = 1; currentMode = 1;
} }
if (needUpdate) {
needUpdate = false;
/* Scroll Logic. */
if (store->GetBox() > 9) {
if (store->GetEntry() < (int)entries.size()) {
store->SetScreenIndx(store->GetScreenIndx() + 1);
}
} else if (store->GetBox() < 5) {
if (store->GetScreenIndx() > 0) {
store->SetScreenIndx(store->GetScreenIndx() - 1);
}
}
}
} }
} }