Skip to content

Commit 7ed234f

Browse files
committed
hi ios are you nice
1 parent 6a52658 commit 7ed234f

File tree

6 files changed

+12
-7
lines changed

6 files changed

+12
-7
lines changed

CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ set(CMAKE_CXX_VISIBILITY_PRESET hidden)
1010

1111
project(DeltaruneTextboxes VERSION 1.4.1)
1212

13+
if ("${CMAKE_SYSTEM_NAME}" STREQUAL "iOS" OR IOS OR (ANDROID AND ANDROID_ABI STREQUAL "armeabi-v7a"))
14+
add_compile_definitions(DISABLE_KEYBOARD)
15+
endif()
16+
1317
add_library(${PROJECT_NAME} SHARED
1418
src/FLAlertLayer.cpp
1519
src/DialogLayer.cpp

mod.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,7 @@
2525
"platforms": [
2626
"win",
2727
"macos",
28-
"android64",
29-
"ios"
28+
"android64"
3029
]
3130
}
3231
},

src/CCKeyboardDispatcher.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "include.h"
22

3-
#if !(defined(DEBUG_MAC_INPUTS) || defined(GEODE_IS_ANDROID32))
3+
#if !defined(DISABLE_KEYBOARD)
44
$execute{
55
keybinds::BindManager::get()->registerBindable(
66
{

src/FLAlertLayer.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ bool DeltaruneAlertLayer::init(FLAlertLayerProtocol* delegate, char const* title
8282
textArea = m_mainLayer->getChildByID("content-text-area");
8383
bg = m_mainLayer->getChildByID("background");
8484
titleNode = static_cast<CCLabelBMFont*>(m_mainLayer->getChildByID("title"));
85-
#if !(defined(DEBUG_MAC_INPUTS) || defined(GEODE_IS_ANDROID32))
85+
#if !defined(DISABLE_KEYBOARD)
8686
initCustomKeybinds();
8787
#endif
8888
Loader::get()->queueInMainThread([bg, titleNode, textArea, this] {
@@ -238,7 +238,7 @@ bool DeltaruneAlertLayer::ccTouchBegan(CCTouch* touch, CCEvent* event) {
238238
clickedOnButton(btn2, m_button2, 2);
239239
return ret;
240240
}
241-
#if (defined(DEBUG_MAC_INPUTS) || defined(GEODE_IS_ANDROID32))
241+
#if defined(DISABLE_KEYBOARD)
242242
void DeltaruneAlertLayer::keyDown(enumKeyCodes key) {
243243
if (m_fields->incompatible) {
244244
FLAlertLayer::keyDown(key);

src/FLAlertLayer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class $modify(DeltaruneAlertLayer, FLAlertLayer) {
7272
void clickedOnButton(CCMenuItemSpriteExtra*, ButtonSprite*, int);
7373
bool ccTouchBegan(CCTouch*, CCEvent*) override;
7474

75-
#if (defined(DEBUG_MAC_INPUTS) || defined(GEODE_IS_ANDROID32))
75+
#if defined(DISABLE_KEYBOARD)
7676
void keyDown(enumKeyCodes) override;
7777
#else
7878
void initCustomKeybinds();

src/include.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
#include <Geode/Geode.hpp>
22

33
#include <Geode/fmod/fmod.hpp>
4-
#if !(defined(DEBUG_MAC_INPUTS) || defined(GEODE_IS_ANDROID32))
4+
5+
#if !defined(DISABLE_KEYBOARD)
56
#include <geode.custom-keybinds/include/Keybinds.hpp>
67
#endif
8+
79
#include <Geode/modify/FLAlertLayer.hpp>
810
#include <Geode/modify/CCKeyboardDispatcher.hpp>
911
#include <Geode/modify/DialogLayer.hpp>

0 commit comments

Comments
 (0)