Skip to content

Commit

Permalink
Wood theme: Revert improved icon scroll speed to fix icon load bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
RocketRobz committed May 10, 2024
1 parent 4bd12a1 commit b342f2d
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 13 deletions.
18 changes: 9 additions & 9 deletions romsel_aktheme/arm9/source/fileBrowse.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -410,8 +410,8 @@ void getGameInfo0(const int fileOffset, std::vector<DirEntry> dirContents) {
}
}

static bool scrollUpByOne = false;
static bool scrollDownByOne = false;
// static bool scrollUpByOne = false;
// static bool scrollDownByOne = false;

void loadIcons(const int screenOffset, std::vector<DirEntry> dirContents) {
clearText(false);
Expand Down Expand Up @@ -511,7 +511,7 @@ void loadIcons(const int screenOffset, std::vector<DirEntry> dirContents) {
updateText(false);
}

extern bool stopDSiAnim;
/* extern bool stopDSiAnim;
extern bool stopDSiAnimNotif;
void loadIconUp(const int screenOffset, std::vector<DirEntry> dirContents) {
Expand Down Expand Up @@ -734,7 +734,7 @@ void loadIconDown(const int screenOffset, std::vector<DirEntry> dirContents) {
updateText(false);
scrollDownByOne = false;
}
} */

void refreshBanners(const int startRow, const int fileOffset, std::vector<DirEntry> dirContents) {
clearText(false);
Expand Down Expand Up @@ -1625,23 +1625,23 @@ std::string browseForFile(const std::vector<std::string_view> extensionList) {
if (screenOffset > 0) {
screenOffset--;
cursorPosOnScreen = fileOffset - screenOffset;
scrollUpByOne = true;
// scrollUpByOne = true;
}
} else if (fileOffset - screenOffset > (0.5 * entriesPerScreen)) {
if (screenOffset + entriesPerScreen < file_count) {
screenOffset++;
cursorPosOnScreen = fileOffset - screenOffset;
scrollDownByOne = true;
// scrollDownByOne = true;
}
}
if (displayIcons && (screenOffsetPrev != screenOffset || listModeSwitched)) {
if (scrollUpByOne) {
/* if (scrollUpByOne) {
loadIconUp(screenOffset, dirContents);
} else if (scrollDownByOne) {
loadIconDown(screenOffset, dirContents);
} else {
} else { */
loadIcons(screenOffset, dirContents);
}
// }
} else {
refreshBanners(screenOffset, fileOffset, dirContents);
}
Expand Down
9 changes: 5 additions & 4 deletions romsel_aktheme/arm9/source/graphics/graphics.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ int frameOf60fps = 60;
int frameDelay = 0;
bool frameDelayEven = true; // For 24FPS
bool renderFrame = true;
bool stopDSiAnim = false;
bool stopDSiAnimNotif = false;
// bool stopDSiAnim = false;
// bool stopDSiAnimNotif = false;

extern int spawnedtitleboxes;

Expand Down Expand Up @@ -1645,10 +1645,11 @@ void vBlankHandler()
}
// if (bnrWirelessIcon > 0) glSprite(24, 12, GL_FLIP_NONE, &wirelessIcons[(bnrWirelessIcon-1) & 31]);
// Playback animated icons
if (!stopDSiAnim && bnriconisDSi[i]) {
// if (!stopDSiAnim && bnriconisDSi[i]) {
if (bnriconisDSi[i]) {
playBannerSequence(i);
}
stopDSiAnimNotif = stopDSiAnim;
// stopDSiAnimNotif = stopDSiAnim;
}
if (iconScaleEnabled) {
if (!iconScaleDelay) {
Expand Down

0 comments on commit b342f2d

Please sign in to comment.