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

Add viewMode change icon.

Browse Source
This commit is contained in:
StackZ
2019-12-24 00:21:46 +01:00
parent 7351204b9a
commit c092c63efe
8 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/gfx/sprites.t3s
+1
View File
@@ -7,6 +7,7 @@ sprites/download_all.png
sprites/top_screen_bot.png
sprites/top_screen_top.png
sprites/search.png
sprites/view.png
sprites/credits/discord.png
sprites/credits/voltZ.png
assets/gfx/sprites/view.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 514 B

include/screens/scriptBrowse.hpp
+3 -1
View File
@@ -48,11 +48,13 @@ private:
mutable int selection = 0;
int keyRepeatDelay = 0;
int fastMode = false;
std::vector<Structs::ButtonPos> arrowPos = {
std::vector<Structs::ButtonPos> arrowPos = {
{295, 0, 25, 25, -1}, // Arrow Up.
{295, 215, 25, 25, -1}, // Arrow Down.
{0, 215, 25, 25, -1}, // Back Arrow.
{0, 0, 25, 25, -1}, // Download All.
{40, 0, 25, 25, -1}, // ViewMode Change.
{75, 0, 25, 25, -1}, // Search.
};
};
include/screens/scriptlist.hpp
+2 -1
View File
@@ -59,10 +59,11 @@ private:
int keyRepeatDelay = 0;
int fastMode = false;
std::vector<Structs::ButtonPos> arrowPos = {
std::vector<Structs::ButtonPos> arrowPos = {
{295, 0, 25, 25, -1}, // Arrow Up.
{295, 215, 25, 25, -1}, // Arrow Down.
{0, 215, 25, 25, -1}, // Back Arrow.
{0, 0, 25, 25, -1}, // viewMode Change
};
};
include/screens/tinyDB.hpp
+3 -1
View File
@@ -46,10 +46,12 @@ private:
mutable int screenPosList = 0;
int keyRepeatDelay = 0;
int fastMode = false;
std::vector<Structs::ButtonPos> arrowPos = {
std::vector<Structs::ButtonPos> arrowPos = {
{295, 0, 25, 25, -1}, // Arrow Up.
{295, 215, 25, 25, -1}, // Arrow Down.
{0, 215, 25, 25, -1}, // Back Arrow.
{0, 0, 25, 25, -1}, // ViewMode Change.
{40, 0, 25, 25, -1}, // Search.
};
};
source/screens/scriptBrowse.cpp
+3 -3
View File
@@ -128,8 +128,8 @@ void ScriptBrowse::Draw(void) const {
Gui::DrawBottom();
Gui::DrawArrow(295, -3);
Gui::DrawArrow(315, 242, 180.0);
// Gui::spriteBlend(sprites_search_idx, -3, 0, Config::TxtColor);
// Gui::DrawString(7.5, 1.5, 0.72f, Config::TxtColor, "\uE003");
Gui::spriteBlend(sprites_view_idx, arrowPos[4].x, arrowPos[4].y);
//Gui::spriteBlend(sprites_search_idx, arrowPos[5].x, arrowPos[5].y);
Gui::spriteBlend(sprites_download_all_idx, 0, 0);
Gui::DrawArrow(0, 242, 270.0);
Gui::DrawStringCentered(-23, 3, 0.6f, Config::TxtColor, std::to_string(selection + 1) + " / " + maxScripts);
@@ -288,7 +288,7 @@ void ScriptBrowse::Logic(u32 hDown, u32 hHeld, touchPosition touch) {
fastMode = false;
}
if (hDown & KEY_X) {
if (hDown & KEY_X || hDown & KEY_TOUCH && touching(touch, arrowPos[4])) {
if (Config::viewMode == 0) {
Config::viewMode = 1;
} else {
source/screens/scriptlist.cpp
+4 -1
View File
@@ -287,6 +287,8 @@ void ScriptList::DrawList(void) const {
Gui::DrawArrow(295, -3);
Gui::DrawArrow(315, 242, 180.0);
Gui::DrawArrow(0, 242, 270.0);
Gui::spriteBlend(sprites_view_idx, arrowPos[3].x, arrowPos[3].y);
if (Config::viewMode == 0) {
for(int i=0;i<ENTRIES_PER_SCREEN && i<(int)fileInfo.size();i++) {
line1 = fileInfo[screenPos + i].title;
@@ -342,6 +344,7 @@ void ScriptList::DrawSingleObject(void) const {
Gui::DrawArrow(295, -3);
Gui::DrawArrow(315, 242, 180.0);
Gui::DrawArrow(0, 242, 270.0);
Gui::spriteBlend(sprites_view_idx, arrowPos[3].x, arrowPos[3].y);
if (Config::viewMode == 0) {
for(int i=0;i<ENTRIES_PER_SCREEN && i<(int)fileInfo2.size();i++) {
@@ -639,7 +642,7 @@ void ScriptList::Logic(u32 hDown, u32 hHeld, touchPosition touch) {
SelectFunction(hDown, hHeld, touch);
}
if (hDown & KEY_X) {
if (hDown & KEY_X || hDown & KEY_TOUCH && touching(touch, arrowPos[3])) {
if (Config::viewMode == 0) {
Config::viewMode = 1;
} else {
source/screens/tinyDB.cpp
+3 -4
View File
@@ -108,9 +108,8 @@ void TinyDB::Draw(void) const {
Gui::DrawArrow(295, -3);
Gui::DrawArrow(315, 242, 180.0);
Gui::DrawArrow(0, 242, 270.0);
// Search Icon.
// Gui::sprite(sprites_search_idx, -3, 0);
// Gui::DrawString(7.5, 1.5, 0.72f, BLACK, "\uE003");
Gui::spriteBlend(sprites_view_idx, arrowPos[3].x, arrowPos[3].y);
// Gui::spriteBlend(sprites_search_idx, arrowPos[4].x, arrowPos[4].y);
if (Config::viewMode == 0) {
for(int i=0;i<ENTRIES_PER_SCREEN && i<(int)tinyDBList.size();i++) {
@@ -219,7 +218,7 @@ void TinyDB::Logic(u32 hDown, u32 hHeld, touchPosition touch) {
}
}
if (hDown & KEY_X) {
if (hDown & KEY_X || hDown & KEY_TOUCH && touching(touch, arrowPos[3])) {
if (Config::viewMode == 0) {
Config::viewMode = 1;
} else {