Skip to content

Commit

Permalink
ill never achieve anything
Browse files Browse the repository at this point in the history
  • Loading branch information
TheSillyDoggo committed Nov 14, 2024
1 parent 050bcf4 commit 10fddf3
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 15 deletions.
3 changes: 2 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ if ("${GEODE_TARGET_PLATFORM}" STREQUAL "iOS" OR IOS)
set(CMAKE_OSX_ARCHITECTURES "arm64")
add_definitions(-DGLES_SILENCE_DEPRECATION)
else()
set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
#set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
set(CMAKE_OSX_ARCHITECTURES "x86_64")
endif()

set(CMAKE_CXX_VISIBILITY_PRESET hidden)
Expand Down
4 changes: 4 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# 1.7.5-beta.2

- Fixed crash closing the mod menu

# 1.7.5-beta.1

- Fixed best run not working
Expand Down
2 changes: 1 addition & 1 deletion mod.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"geode": "4.0.0-alpha.1",
"version": "v1.7.5-beta.1",
"version": "v1.7.5-beta.2",
"gd": {
"win": "2.2074",
"android": "2.2074",
Expand Down
19 changes: 6 additions & 13 deletions src/Client/AndroidUI.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,8 @@ bool AndroidUI::setup()
panel->addChild(versionParent);

goToPage(selectedTab);
updateVersionLabel();
updateSearchBox();
updateVersionLabel();

//if (Client::GetModuleEnabled("npesta-width"))
//{
Expand Down Expand Up @@ -253,11 +253,13 @@ void AndroidUI::updateVersionLabel()
}

hasCheckedForUpdates = true;
updateSearchBox();
updateVersionLabel();
}
else if (event->isCancelled())
{
hasCheckedForUpdates = false;
updateSearchBox();
updateVersionLabel();
}
});
Expand Down Expand Up @@ -449,17 +451,6 @@ void AndroidUI::goToPage(int p, bool transition)

void AndroidUI::onClose(CCObject* sender)
{
if (auto pause = CCScene::get()->getChildByType<PauseLayer>(0))
{
handleTouchPriority(pause);
}

CCTouchDispatcher::get()->unregisterForcePrio(this);
CCTouchDispatcher::get()->removeDelegate(this);

if (CCTouchDispatcher::get()->m_pTargetedHandlers->containsObject(this))
CCTouchDispatcher::get()->m_pTargetedHandlers->removeObject(this, false);

this->removeFromParent();
}

Expand Down Expand Up @@ -514,6 +505,7 @@ void AndroidUI::onPressTab(CCObject* sender)
void AndroidUI::updateTabs()
{
int i = 0;

for (auto sprite : sprites)
{
sprite->updateSelection(i == selectedTab ? CategorySelectionType::Selected : CategorySelectionType::Deselected);
Expand All @@ -526,7 +518,8 @@ AndroidUI* AndroidUI::create()
{
auto pRet = new AndroidUI();

if (pRet->initAnchored(240.f, 160.f)) {
if (pRet->initAnchored(240.f, 160.f))
{
pRet->autorelease();
return pRet;
}
Expand Down

0 comments on commit 10fddf3

Please sign in to comment.