Skip to content

iOS safe areas #168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Alphalaneous wants to merge 9 commits into
base: main
Choose a base branch
from
Open

iOS safe areas #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ff77193
start of iOS safe areas
Alphalaneous May 13, 2026
71a8a0f
Fix a doofus mistake
Alphalaneous May 13, 2026
1da4fdd
Update LevelBrowserLayer.cpp
Alphalaneous May 13, 2026
1e04a2a
Adjustments
Alphalaneous May 13, 2026
ff7df76
Update LevelBrowserLayer.cpp
Alphalaneous May 13, 2026
944e842
Revert mod.json change
Alphalaneous May 13, 2026
0a6396d
Test halving instead
Alphalaneous May 13, 2026
5bfd92b
Update mod.json
Alphalaneous May 13, 2026
69cc3d4
Formatting fix
Alphalaneous May 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mod.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"geode": "5.3.0",
"geode": "5.7.1",
"gd": {
"win": "2.2081",
"android": "2.2081",
Expand Down
4 changes: 2 additions & 2 deletions src/EditorPauseLayer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ class GuidelinesButtonDummy {
}
}
optionsMenu->setContentSize({ 120.f, winSize.height - 60.f });
optionsMenu->setPosition(75.f, winSize.height / 2 - 25.f + 10.f);
optionsMenu->setPosition(75.f GEODE_IOS(+ geode::utils::getSafeAreaRect().getMinX() / 2.f), winSize.height / 2 - 25.f + 10.f);
optionsMenu->updateLayout();

auto settingsMenu = detachAndCreateMenu(
Expand Down Expand Up @@ -288,7 +288,7 @@ class GuidelinesButtonDummy {
);
}
menu->setContentSize({ 180.f, 100.f });
menu->setPosition(100.f, winSize.height - 55.f);
menu->setPosition(100.f GEODE_IOS(+ geode::utils::getSafeAreaRect().getMinX() / 2.f), winSize.height - 55.f);
menu->updateLayout();
}
}
Expand Down
8 changes: 4 additions & 4 deletions src/EditorUI.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ using namespace geode::node_ids;
menu->getChildByID("snap-button")
);
toolbarTogglesMenu->setPosition(
winSize.width - 47.f,
winSize.width - 47.f GEODE_IOS(- geode::utils::getSafeAreaRect().getMinX() / 2.f),
45.f
);
toolbarTogglesMenu->setContentSize({ 90.f, 90.f });
Expand Down Expand Up @@ -155,7 +155,7 @@ using namespace geode::node_ids;
linkMenu->setPositionY(playTestMenu->getPositionY() + 3 - (linkMenu->getContentHeight() / 2) GEODE_MOBILE(- 24.f));
linkMenu->updateLayout();

menu->setPosition(42.f, 45.f);
menu->setPosition(42.f GEODE_IOS(+ geode::utils::getSafeAreaRect().getMinX() / 2.f), 45.f);
menu->setContentSize({ 100.f, 90.f });
menu->setLayout(
ColumnLayout::create()
Expand Down Expand Up @@ -414,7 +414,7 @@ using namespace geode::node_ids;
}
rightMenu->setContentSize({ 210.f, 160.f });
rightMenu->setPosition(
winSize.width - 210.f / 2,
winSize.width - 210.f / 2 GEODE_IOS(- geode::utils::getSafeAreaRect().getMinX() / 2.f),
winSize.height - 117.5f
);
rightMenu->updateLayout();
Expand All @@ -436,7 +436,7 @@ using namespace geode::node_ids;
this->getChildByID("layer-index-label"),
menu->getChildByID("next-layer-button")
);
layerMenu->setPositionX(winSize.width - 110.f / 2 - 6.f);
layerMenu->setPositionX(winSize.width - 110.f / 2 - 6.f GEODE_IOS(- geode::utils::getSafeAreaRect().getMinX() / 2.f));
layerMenu->setContentSize({ 110.f, 30.f });
layerMenu->updateLayout();
}
Expand Down
25 changes: 21 additions & 4 deletions src/LevelBrowserLayer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ using namespace geode::node_ids;
pageMenu->setContentSize({ 40.f, 110.f });
pageMenu->setAnchorPoint({ 1.f, .5f });
pageMenu->setPosition(
pageMenu->getPositionX() + 20.f,
winSize.width - 10 GEODE_IOS(- geode::utils::getSafeAreaRect().getMinX() / 2.f),
pageMenu->getPositionY() - 110.f / 2 + 12.5f
);
pageMenu->updateLayout();
Expand Down Expand Up @@ -146,7 +146,7 @@ using namespace geode::node_ids;
);
menu->setContentSize({ navMenuWidth, 40.f });
menu->setPositionX(
winSize.width - navMenuWidth / 2 - 5.f
winSize.width - navMenuWidth / 2 - 5.f GEODE_IOS(- geode::utils::getSafeAreaRect().getMinX() / 2.f)
);
menu->updateLayout();
}
Expand Down Expand Up @@ -194,11 +194,18 @@ using namespace geode::node_ids;
->setAxisAlignment(AxisAlignment::Start),
myLevelsBtn
);
menu->setContentSize({ 50.f, 125.f });
#ifdef GEODE_IS_IOS
menu->addOnEnterCallback([menu] {
if (menu->getChildrenCount() > 1) {
menu->setPositionX(menu->getContentWidth() / 2 + 5 + geode::utils::getSafeAreaRect().getMinX() / 2.f);
}
});
#endif
menu->setPositionY(
menu->getPositionY() + 125.f / 2 -
myLevelsBtn->getScaledContentSize().height / 2
);
menu->setContentSize({ 50.f, 125.f });
menu->updateLayout();
}
}
Expand All @@ -209,11 +216,21 @@ using namespace geode::node_ids;
ColumnLayout::create()
->setAxisAlignment(AxisAlignment::Start)
);

menu->setContentSize({ 50.f, 130.f });

#ifdef GEODE_IS_IOS
menu->addOnEnterCallback([menu, winSize] {
if (menu->getChildrenCount() > 2) {
menu->setPositionX(winSize.width - menu->getContentWidth() / 2 - 5 - geode::utils::getSafeAreaRect().getMinX() / 2.f);
}
});
#endif

menu->setPositionY(
menu->getPositionY() + 130.f / 2 -
getSizeSafe(newLvlBtn).height / 2
);
menu->setContentSize({ 50.f, 130.f });
menu->updateLayout();
}
}
Expand Down
8 changes: 3 additions & 5 deletions src/LevelInfoLayer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ using namespace geode::node_ids;
}

auto leftSideMenu = CCMenu::create();
leftSideMenu->setPosition(30.f, winSize.height / 2);
leftSideMenu->setPosition(30.f GEODE_IOS(+ geode::utils::getSafeAreaRect().getMinX() / 2.f), winSize.height / 2);
leftSideMenu->setLayout(ColumnLayout::create());
leftSideMenu->setID("left-side-menu");
leftSideMenu->setContentSize({ 50.f, 145.f });
Expand All @@ -137,13 +137,11 @@ using namespace geode::node_ids;
setIDSafe(menu, rightMenuIdx++, "like-button");
setIDSafe(menu, rightMenuIdx++, "rate-button");

menu->setContentSize({ 60.f, winSize.height - 15.f });
menu->setPosition(
menu->getPositionX() + static_cast<CCNode*>(
menu->getChildren()->objectAtIndex(0)
)->getPositionX(),
winSize.width - 30 GEODE_IOS(- geode::utils::getSafeAreaRect().getMinX() / 2.f),
winSize.height / 2
);
menu->setContentSize({ 60.f, winSize.height - 15.f });
menu->setLayout(
ColumnLayout::create()
->setGap(3.f)
Expand Down
4 changes: 2 additions & 2 deletions src/LevelListLayer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ using namespace geode::node_ids;
if(!mainMenu) return;

auto rightSideMenu = CCMenu::create();
rightSideMenu->setPosition(winSize.width - 25.f, winSize.height / 2);
rightSideMenu->setPosition(winSize.width - 25.f GEODE_IOS(- geode::utils::getSafeAreaRect().getMinX() / 2.f), winSize.height / 2);
rightSideMenu->setLayout(
ColumnLayout::create()
->setAxisReverse(true)
Expand Down Expand Up @@ -215,7 +215,7 @@ struct LevelListLayerIDs : Modify<LevelListLayerIDs, LevelListLayer> {
auto winSize = CCDirector::sharedDirector()->getWinSize();

auto leftSideMenu = CCMenu::create();
leftSideMenu->setPosition(26.f, winSize.height / 2);
leftSideMenu->setPosition(26.f GEODE_IOS(+ geode::utils::getSafeAreaRect().getMinX() / 2.f), winSize.height / 2);
leftSideMenu->setLayout(
ColumnLayout::create()
->setAxisReverse(true)
Expand Down
2 changes: 1 addition & 1 deletion src/LevelSearchLayer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ using namespace geode::node_ids;
->setAxisAlignment(AxisAlignment::End)
);
filtermenu->setAnchorPoint({1, 0.5f});
filtermenu->setPosition({winSize.width - 5, filtermenu->getPositionY()});
filtermenu->setPosition({winSize.width - 5 GEODE_IOS(- geode::utils::getSafeAreaRect().getMinX() / 2.f), filtermenu->getPositionY()});
filtermenu->setContentSize({filtermenu->getContentSize().width, winSize.height-10});

setIDSafe(filtermenu, 0, "clear-filters-button");
Expand Down