Merge pull request #553 from dkimitsa/hotfix/uikey-multiple-overrides

* hot fix for CompilerException while compiling UIKey.keyCode
MobiVM · Jan 20, 2021 · 8d6ae8d · 8d6ae8d
2 parents 5c7b9ab + 9b9f592
commit 8d6ae8d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/compiler/cocoatouch/src/main/bro-gen/uikit.yaml b/compiler/cocoatouch/src/main/bro-gen/uikit.yaml
@@ -4294,7 +4294,11 @@ classes:
     UIToolbarAppearance: {} #since 13.0
     UIWindowScene: {} #since 13.0
     UIWindowSceneDestructionRequestOptions: {} #since 13.0
-    UIKey: {} #since 13.4
+    UIKey:  #since 13.4
+        properties:
+            'keyCode':
+                name: keyCodeRaw
+                type: "@MachineSizedSInt long"
     NSDiffableDataSourceSectionSnapshot: #since 14.0
         methods:
             '-appendItems:intoParentItem:':

diff --git a/compiler/cocoatouch/src/main/java/org/robovm/apple/uikit/UIKey.java b/compiler/cocoatouch/src/main/java/org/robovm/apple/uikit/UIKey.java
@@ -69,12 +69,13 @@ public UIKey() {}
     @Property(selector = "modifierFlags")
     public native UIKeyModifierFlags getModifierFlags();
     @Property(selector = "keyCode")
-    public native UIKeyboardHIDUsage getKeyCode();
+    public native @MachineSizedSInt long getKeyCodeRaw();
     /*</properties>*/
 
-    // manually added method to access keyCodes that are missing in UIKeyboardHIDUsage
-    @Property(selector = "keyCode")
-    public native @MachineSizedSInt long getKeyCodeRaw();
+    // manually added method, converts raw value into UIKeyboardHIDUsage
+    public UIKeyboardHIDUsage getKeyCode() {
+        return UIKeyboardHIDUsage.valueOf(getKeyCodeRaw());
+    }
 
     /*<members>*//*</members>*/
     /*<methods>*/