Skip to content

Commit 3e664bf

Browse files
committed
big fingers & horizontal scroll
1 parent 85f2d46 commit 3e664bf

4 files changed

Lines changed: 14 additions & 3 deletions

File tree

src/DevTools.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ void DevTools::highlightNode(CCNode* node, HighlightMode mode) {
4545
}
4646

4747
void DevTools::drawPage(const char* name, void(DevTools::*pageFun)()) {
48-
if (ImGui::Begin(name)) {
48+
if (ImGui::Begin(name, nullptr, ImGuiWindowFlags_HorizontalScrollbar)) {
4949
(this->*pageFun)();
5050
}
5151
ImGui::End();

src/pages/Settings.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,22 @@ static float RAINBOW_HUE = 0.f;
1313

1414
void DevTools::drawSettings() {
1515
ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, { 1.f, 1.f });
16+
17+
#ifdef GEODE_IS_MOBILE
18+
ImGui::Dummy({0.f, 60.f});
19+
#endif
20+
1621
// TODO: fix this option as it hasnt worked in a while lol
1722
#if 0
1823
ImGui::Checkbox("GD in Window", &m_GDInWindow);
1924
if (ImGui::IsItemHovered()) {
2025
ImGui::SetTooltip("Show GD inside a window when DevTools are open");
2126
}
22-
#endif
2327
ImGui::Checkbox("Attributes in Tree", &m_attributesInTree);
2428
if (ImGui::IsItemHovered()) {
2529
ImGui::SetTooltip("Show node attributes in the Tree");
2630
}
31+
#endif
2732
ImGui::Checkbox("Highlight Nodes", &m_alwaysHighlight);
2833
if (ImGui::IsItemHovered()) {
2934
ImGui::SetTooltip(

src/pages/Tree.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,5 +74,9 @@ void DevTools::drawTreeBranch(CCNode* node, size_t index) {
7474
}
7575

7676
void DevTools::drawTree() {
77+
#ifdef GEODE_IS_MOBILE
78+
ImGui::Dummy({0.f, 60.f});
79+
#endif
80+
7781
this->drawTreeBranch(CCDirector::get()->getRunningScene(), 0);
7882
}

src/platform/Android.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ using namespace geode::prelude;
77
#include "utils.hpp"
88

99
std::string formatAddressIntoOffsetImpl(uintptr_t addr) {
10-
return fmt::format("idk + {:#x}", addr);
10+
if (addr > base::get() && addr - 0x1000000 < base::get())
11+
return fmt::format("libcocos2d.so + {:#x}", addr - base::get());
12+
return fmt::format("{:#x}", addr);
1113
}
1214

1315
#endif

0 commit comments

Comments
 (0)