Skip to content

Commit 1c73f4a

Browse files
committed
dont need strings anymore
1 parent 3dccc2e commit 1c73f4a

2 files changed

Lines changed: 6 additions & 17 deletions

File tree

Example/Assets/Plugins/NativeEditBox/NativeEditBox.ios.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
public partial class NativeEditBox : IPointerClickHandler
1313
{
1414
[DllImport("__Internal")]
15-
static extern IntPtr _CNativeEditBox_Init(string gameObject, int instanceId, bool multiline);
15+
static extern IntPtr _CNativeEditBox_Init(int instanceId, bool multiline);
1616

1717
[DllImport("__Internal")]
1818
static extern void _CNativeEditBox_Destroy(IntPtr instance);
@@ -192,7 +192,7 @@ void SetupInputField()
192192
TMP_Text text = inputField.textComponent;
193193
TMP_Text placeholder = inputField.placeholder as TMP_Text;
194194

195-
editBox = _CNativeEditBox_Init(name, GetInstanceID(), inputField.lineType != TMP_InputField.LineType.SingleLine);
195+
editBox = _CNativeEditBox_Init(GetInstanceID(), inputField.lineType != TMP_InputField.LineType.SingleLine);
196196
_CNativeEditBox_RegisterKeyboardChangedCallback(delegateKeyboardChanged);
197197
_CNativeEditBox_RegisterTextCallbacks(delegateTextChanged, delegateDidEnd, delegateSubmitPressed);
198198
_CNativeEditBox_RegisterEmptyCallbacks(delegateGotFocus, delegateTapOutside);

Example/Assets/Plugins/NativeEditBox/iOS/NativeEditBox.mm

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
// NOTE: we need extern without "C" before unity 4.5
4444
//extern UIViewController *UnityGetGLViewController();
4545
extern "C" UIViewController *UnityGetGLViewController();
46-
extern "C" void UnitySendMessage(const char *, const char *, const char *);
4746

4847
char* MakeStringCopy(const char* string)
4948
{
@@ -68,7 +67,6 @@
6867

6968
@interface CEditBoxPlugin : NSObject<UITextFieldDelegate, UITextViewDelegate>
7069
{
71-
NSString* gameObjectName;
7270
int instanceId;
7371
UIView *editView;
7472
int characterLimit;
@@ -78,11 +76,10 @@ @interface CEditBoxPlugin : NSObject<UITextFieldDelegate, UITextViewDelegate>
7876

7977
@implementation CEditBoxPlugin
8078

81-
-(id)initWithGameObjectName:(NSString *)gameObjectName_ instanceId:(int)instanceId_ multiline:(BOOL)multiline
79+
-(id)initWithInstanceId:(int)instanceId_ multiline:(BOOL)multiline
8280
{
8381
self = [super init];
8482

85-
gameObjectName = gameObjectName_;
8683
instanceId = instanceId_;
8784

8885
characterLimit = 0;
@@ -148,8 +145,6 @@ -(void)dealloc
148145

149146
UIView *view = UnityGetGLViewController().view;
150147
[view removeGestureRecognizer:tapper];
151-
152-
gameObjectName = nil;
153148
}
154149

155150
// UITextField
@@ -598,11 +593,6 @@ - (CGFloat)getScale:(UIView *)view
598593
return view.contentScaleFactor;
599594
}
600595

601-
-(void)sendMessageToUnity:(NSString *)methodName parameter:(NSString *)parameter
602-
{
603-
UnitySendMessage([gameObjectName UTF8String], [methodName UTF8String], [parameter UTF8String]);
604-
}
605-
606596
@end
607597

608598
@interface CEditBoxGlobalPlugin : NSObject
@@ -663,7 +653,7 @@ - (CGFloat)getScale:(UIView *)view
663653
static CEditBoxGlobalPlugin *globalPlugin = nil;
664654

665655
extern "C" {
666-
void *_CNativeEditBox_Init(const char *gameObjectName, int instanceId, BOOL multiline);
656+
void *_CNativeEditBox_Init(int instanceId, BOOL multiline);
667657
void _CNativeEditBox_Destroy(void *instance);
668658
void _CNativeEditBox_SetFocus(void *instance, BOOL doFocus);
669659
void _CNativeEditBox_SetPlacement(void *instance, int left, int top, int right, int bottom);
@@ -683,15 +673,14 @@ - (CGFloat)getScale:(UIView *)view
683673
void _CNativeEditBox_RegisterEmptyCallbacks(DelegateEmpty gotFocus, DelegateEmpty tapOutside);
684674
}
685675

686-
void *_CNativeEditBox_Init(const char *gameObjectName, int instanceId, BOOL multiline)
676+
void *_CNativeEditBox_Init(int instanceId, BOOL multiline)
687677
{
688678
if(globalPlugin == nil)
689679
{
690680
globalPlugin = [[CEditBoxGlobalPlugin alloc] init];
691681
}
692682

693-
id instance = [[CEditBoxPlugin alloc]initWithGameObjectName:[NSString stringWithUTF8String:gameObjectName]
694-
instanceId:instanceId multiline:multiline];
683+
id instance = [[CEditBoxPlugin alloc]initWithInstanceId:instanceId multiline:multiline];
695684

696685
return (__bridge_retained void *)instance;
697686
}

0 commit comments

Comments
 (0)