From 9ca9c2e32cc98094beee831aae7f9dd0357f2d95 Mon Sep 17 00:00:00 2001 From: Josh Tynjala Date: Mon, 5 Jun 2023 15:56:26 -0700 Subject: [PATCH 1/5] Better Haxe 4.3 extern enum abstract Previous attempt tried to use @:extern and @:enum for Haxe 3, but enum is fine for both, which is actually what we were using before. Keep @:extern for Haxe 3, but use enum for both --- externs/air/flash/data/SQLCollationType.hx | 2 +- externs/air/flash/data/SQLColumnNameStyle.hx | 2 +- externs/air/flash/data/SQLMode.hx | 2 +- externs/air/flash/data/SQLTransactionLockType.hx | 2 +- externs/air/flash/desktop/InvokeEventReason.hx | 2 +- externs/air/flash/desktop/NativeDragActions.hx | 2 +- externs/air/flash/desktop/NotificationType.hx | 2 +- externs/air/flash/desktop/SystemIdleMode.hx | 2 +- externs/air/flash/display/NativeWindowDisplayState.hx | 2 +- externs/air/flash/display/NativeWindowRenderMode.hx | 2 +- externs/air/flash/display/NativeWindowResize.hx | 2 +- externs/air/flash/display/NativeWindowSystemChrome.hx | 2 +- externs/air/flash/display/NativeWindowType.hx | 2 +- externs/air/flash/display/StageAspectRatio.hx | 2 +- externs/air/flash/display/StageOrientation.hx | 2 +- externs/air/flash/display3D/Context3DProfile.hx | 2 +- externs/air/flash/errors/SQLErrorOperation.hx | 2 +- externs/air/flash/events/TouchEventIntent.hx | 2 +- externs/air/flash/filesystem/FileMode.hx | 2 +- externs/air/flash/media/AudioPlaybackMode.hx | 2 +- externs/air/flash/media/CameraPosition.hx | 2 +- externs/air/flash/media/MediaType.hx | 2 +- externs/air/flash/net/IPVersion.hx | 2 +- externs/air/flash/notifications/NotificationStyle.hx | 2 +- externs/air/flash/printing/PaperSize.hx | 2 +- externs/air/flash/printing/PrintMethod.hx | 2 +- externs/air/flash/security/ReferencesValidationSetting.hx | 2 +- externs/air/flash/security/RevocationCheckSettings.hx | 2 +- externs/air/flash/security/SignatureStatus.hx | 2 +- externs/air/flash/security/SignerTrustSettings.hx | 2 +- externs/air/flash/text/AutoCapitalize.hx | 2 +- externs/air/flash/text/ReturnKeyLabel.hx | 2 +- externs/air/flash/text/SoftKeyboardType.hx | 2 +- externs/air/flash/text/StageTextClearButtonMode.hx | 2 +- 34 files changed, 34 insertions(+), 34 deletions(-) diff --git a/externs/air/flash/data/SQLCollationType.hx b/externs/air/flash/data/SQLCollationType.hx index fbe18701d..a8c24f41c 100644 --- a/externs/air/flash/data/SQLCollationType.hx +++ b/externs/air/flash/data/SQLCollationType.hx @@ -1,7 +1,7 @@ package flash.data; @:native("flash.data.SQLCollationType") -#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract SQLCollationType(String) +#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract SQLCollationType(String) { var BINARY; var NO_CASE; diff --git a/externs/air/flash/data/SQLColumnNameStyle.hx b/externs/air/flash/data/SQLColumnNameStyle.hx index c27bc6661..e4a8946f3 100644 --- a/externs/air/flash/data/SQLColumnNameStyle.hx +++ b/externs/air/flash/data/SQLColumnNameStyle.hx @@ -1,7 +1,7 @@ package flash.data; @:native("flash.data.SQLColumnNameStyle") -#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract SQLColumnNameStyle(String) +#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract SQLColumnNameStyle(String) { var DEFAULT; var LONG; diff --git a/externs/air/flash/data/SQLMode.hx b/externs/air/flash/data/SQLMode.hx index 284a3d04d..35371ecfe 100644 --- a/externs/air/flash/data/SQLMode.hx +++ b/externs/air/flash/data/SQLMode.hx @@ -1,7 +1,7 @@ package flash.data; @:native("flash.data.SQLMode") -#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract SQLMode(String) +#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract SQLMode(String) { var CREATE; var READ; diff --git a/externs/air/flash/data/SQLTransactionLockType.hx b/externs/air/flash/data/SQLTransactionLockType.hx index 16912db4c..9f9f0ab57 100644 --- a/externs/air/flash/data/SQLTransactionLockType.hx +++ b/externs/air/flash/data/SQLTransactionLockType.hx @@ -1,7 +1,7 @@ package flash.data; @:native("flash.data.SQLTransactionLockType") -#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract SQLTransactionLockType(String) +#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract SQLTransactionLockType(String) { var DEFERRED; var EXCLUSIVE; diff --git a/externs/air/flash/desktop/InvokeEventReason.hx b/externs/air/flash/desktop/InvokeEventReason.hx index 216be7d91..32d5fadd5 100644 --- a/externs/air/flash/desktop/InvokeEventReason.hx +++ b/externs/air/flash/desktop/InvokeEventReason.hx @@ -1,7 +1,7 @@ package flash.desktop; @:native("flash.desktop.InvokeEventReason") -#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract InvokeEventReason(String) +#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract InvokeEventReason(String) { var LOGIN; var NOTIFICATION; diff --git a/externs/air/flash/desktop/NativeDragActions.hx b/externs/air/flash/desktop/NativeDragActions.hx index d40e9168c..36a55309e 100644 --- a/externs/air/flash/desktop/NativeDragActions.hx +++ b/externs/air/flash/desktop/NativeDragActions.hx @@ -1,7 +1,7 @@ package flash.desktop; @:native("flash.desktop.NativeDragActions") -#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract NativeDragActions(String) +#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract NativeDragActions(String) { var COPY; var LINK; diff --git a/externs/air/flash/desktop/NotificationType.hx b/externs/air/flash/desktop/NotificationType.hx index 8066974bb..7fa80ff50 100644 --- a/externs/air/flash/desktop/NotificationType.hx +++ b/externs/air/flash/desktop/NotificationType.hx @@ -1,7 +1,7 @@ package flash.desktop; @:native("flash.desktop.NotificationType") -#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract NotificationType(String) +#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract NotificationType(String) { var CRITICAL; var INFORMATIONAL; diff --git a/externs/air/flash/desktop/SystemIdleMode.hx b/externs/air/flash/desktop/SystemIdleMode.hx index 96d9d2b99..e2ddd69c2 100644 --- a/externs/air/flash/desktop/SystemIdleMode.hx +++ b/externs/air/flash/desktop/SystemIdleMode.hx @@ -1,7 +1,7 @@ package flash.desktop; @:native("flash.desktop.SystemIdleMode") -#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract SystemIdleMode(String) +#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract SystemIdleMode(String) { var KEEP_AWAKE; var NORMAL; diff --git a/externs/air/flash/display/NativeWindowDisplayState.hx b/externs/air/flash/display/NativeWindowDisplayState.hx index f90cfc645..01c6e6d6f 100644 --- a/externs/air/flash/display/NativeWindowDisplayState.hx +++ b/externs/air/flash/display/NativeWindowDisplayState.hx @@ -1,7 +1,7 @@ package flash.display; @:native("flash.display.NativeWindowDisplayState") -#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract NativeWindowDisplayState(String) +#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract NativeWindowDisplayState(String) { var MAXIMIZED; var MINIMIZED; diff --git a/externs/air/flash/display/NativeWindowRenderMode.hx b/externs/air/flash/display/NativeWindowRenderMode.hx index 7f4d8a48a..079400ac8 100644 --- a/externs/air/flash/display/NativeWindowRenderMode.hx +++ b/externs/air/flash/display/NativeWindowRenderMode.hx @@ -1,7 +1,7 @@ package flash.display; @:native("flash.display.NativeWindowRenderMode") -#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract NativeWindowRenderMode(String) +#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract NativeWindowRenderMode(String) { var AUTO; var CPU; diff --git a/externs/air/flash/display/NativeWindowResize.hx b/externs/air/flash/display/NativeWindowResize.hx index 3adf87ef6..2d738d78a 100644 --- a/externs/air/flash/display/NativeWindowResize.hx +++ b/externs/air/flash/display/NativeWindowResize.hx @@ -1,7 +1,7 @@ package flash.display; @:native("flash.display.NativeWindowResize") -#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract NativeWindowResize(String) +#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract NativeWindowResize(String) { var BOTTOM; var BOTTOM_LEFT; diff --git a/externs/air/flash/display/NativeWindowSystemChrome.hx b/externs/air/flash/display/NativeWindowSystemChrome.hx index 33a39cc12..de606b526 100644 --- a/externs/air/flash/display/NativeWindowSystemChrome.hx +++ b/externs/air/flash/display/NativeWindowSystemChrome.hx @@ -1,7 +1,7 @@ package flash.display; @:native("flash.display.NativeWindowSystemChrome") -#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract NativeWindowSystemChrome(String) +#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract NativeWindowSystemChrome(String) { var ALTERNATE; var NONE; diff --git a/externs/air/flash/display/NativeWindowType.hx b/externs/air/flash/display/NativeWindowType.hx index 5a278235b..7ffff5824 100644 --- a/externs/air/flash/display/NativeWindowType.hx +++ b/externs/air/flash/display/NativeWindowType.hx @@ -1,7 +1,7 @@ package flash.display; @:native("flash.display.NativeWindowType") -#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract NativeWindowType(String) +#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract NativeWindowType(String) { var LIGHTWEIGHT; var NORMAL; diff --git a/externs/air/flash/display/StageAspectRatio.hx b/externs/air/flash/display/StageAspectRatio.hx index e663ce877..740d04e65 100644 --- a/externs/air/flash/display/StageAspectRatio.hx +++ b/externs/air/flash/display/StageAspectRatio.hx @@ -1,7 +1,7 @@ package flash.display; @:native("flash.display.StageAspectRatio") -#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract StageAspectRatio(String) +#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract StageAspectRatio(String) { var ANY; var LANDSCAPE; diff --git a/externs/air/flash/display/StageOrientation.hx b/externs/air/flash/display/StageOrientation.hx index bb85291a4..f61d7f6ec 100644 --- a/externs/air/flash/display/StageOrientation.hx +++ b/externs/air/flash/display/StageOrientation.hx @@ -1,7 +1,7 @@ package flash.display; @:native("flash.display.StageOrientation") -#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract StageOrientation(String) +#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract StageOrientation(String) { var DEFAULT; var ROTATED_LEFT; diff --git a/externs/air/flash/display3D/Context3DProfile.hx b/externs/air/flash/display3D/Context3DProfile.hx index c7cec015d..83c272238 100644 --- a/externs/air/flash/display3D/Context3DProfile.hx +++ b/externs/air/flash/display3D/Context3DProfile.hx @@ -1,7 +1,7 @@ package flash.display3D; @:native("flash.display3D.Context3DProfile") -#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract Context3DProfile(String) +#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract Context3DProfile(String) { var BASELINE; var BASELINE_CONSTRAINED; diff --git a/externs/air/flash/errors/SQLErrorOperation.hx b/externs/air/flash/errors/SQLErrorOperation.hx index b0011cbad..a83b425e0 100644 --- a/externs/air/flash/errors/SQLErrorOperation.hx +++ b/externs/air/flash/errors/SQLErrorOperation.hx @@ -1,7 +1,7 @@ package flash.errors; @:native("flash.errors.SQLErrorOperation") -#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract SQLErrorOperation(String) +#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract SQLErrorOperation(String) { var ANALYZE; var ATTACH; diff --git a/externs/air/flash/events/TouchEventIntent.hx b/externs/air/flash/events/TouchEventIntent.hx index 7df2d0a5a..c16b1f0e0 100644 --- a/externs/air/flash/events/TouchEventIntent.hx +++ b/externs/air/flash/events/TouchEventIntent.hx @@ -1,7 +1,7 @@ package flash.events; @:native("flash.events.TouchEventIntent") -#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract TouchEventIntent(String) +#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract TouchEventIntent(String) { var ERASER; var PEN; diff --git a/externs/air/flash/filesystem/FileMode.hx b/externs/air/flash/filesystem/FileMode.hx index db258317e..30910b81e 100644 --- a/externs/air/flash/filesystem/FileMode.hx +++ b/externs/air/flash/filesystem/FileMode.hx @@ -1,7 +1,7 @@ package flash.filesystem; @:native("flash.filesystem.FileMode") -#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract FileMode(String) +#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract FileMode(String) { var APPEND; var READ; diff --git a/externs/air/flash/media/AudioPlaybackMode.hx b/externs/air/flash/media/AudioPlaybackMode.hx index 600373424..1b37a6008 100644 --- a/externs/air/flash/media/AudioPlaybackMode.hx +++ b/externs/air/flash/media/AudioPlaybackMode.hx @@ -1,7 +1,7 @@ package flash.media; @:native("flash.media.AudioPlaybackMode") -#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract AudioPlaybackMode(String) +#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract AudioPlaybackMode(String) { var AMBIENT; var MEDIA; diff --git a/externs/air/flash/media/CameraPosition.hx b/externs/air/flash/media/CameraPosition.hx index db892195e..dfe437046 100644 --- a/externs/air/flash/media/CameraPosition.hx +++ b/externs/air/flash/media/CameraPosition.hx @@ -1,7 +1,7 @@ package flash.media; @:native("flash.media.CameraPosition") -#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract CameraPosition(String) +#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract CameraPosition(String) { var BACK; var FRONT; diff --git a/externs/air/flash/media/MediaType.hx b/externs/air/flash/media/MediaType.hx index ca1b64cca..189688732 100644 --- a/externs/air/flash/media/MediaType.hx +++ b/externs/air/flash/media/MediaType.hx @@ -1,7 +1,7 @@ package flash.media; @:native("flash.media.MediaType") -#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract MediaType(String) +#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract MediaType(String) { var IMAGE; var VIDEO; diff --git a/externs/air/flash/net/IPVersion.hx b/externs/air/flash/net/IPVersion.hx index b6c6abe50..8df99a6a6 100644 --- a/externs/air/flash/net/IPVersion.hx +++ b/externs/air/flash/net/IPVersion.hx @@ -1,7 +1,7 @@ package flash.net; @:native("flash.net.IPVersion") -#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract IPVersion(String) +#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract IPVersion(String) { var IPV4; var IPV6; diff --git a/externs/air/flash/notifications/NotificationStyle.hx b/externs/air/flash/notifications/NotificationStyle.hx index 35a3272ec..0de1e567b 100644 --- a/externs/air/flash/notifications/NotificationStyle.hx +++ b/externs/air/flash/notifications/NotificationStyle.hx @@ -1,7 +1,7 @@ package flash.notifications; @:native("flash.notifications.NotificationStyle") -#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract NotificationStyle(String) +#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract NotificationStyle(String) { var ALERT; var BADGE; diff --git a/externs/air/flash/printing/PaperSize.hx b/externs/air/flash/printing/PaperSize.hx index 2e50a25e3..dbd0a5f6e 100644 --- a/externs/air/flash/printing/PaperSize.hx +++ b/externs/air/flash/printing/PaperSize.hx @@ -1,7 +1,7 @@ package flash.printing; @:native("flash.printing.PaperSize") -#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract PaperSize(String) +#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract PaperSize(String) { var A4; var A5; diff --git a/externs/air/flash/printing/PrintMethod.hx b/externs/air/flash/printing/PrintMethod.hx index c8f57b03d..81669995f 100644 --- a/externs/air/flash/printing/PrintMethod.hx +++ b/externs/air/flash/printing/PrintMethod.hx @@ -1,7 +1,7 @@ package flash.printing; @:native("flash.printing.PrintMethod") -#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract PrintMethod(String) +#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract PrintMethod(String) { var AUTO; var BITMAP; diff --git a/externs/air/flash/security/ReferencesValidationSetting.hx b/externs/air/flash/security/ReferencesValidationSetting.hx index 1c946d554..a189ff390 100644 --- a/externs/air/flash/security/ReferencesValidationSetting.hx +++ b/externs/air/flash/security/ReferencesValidationSetting.hx @@ -1,7 +1,7 @@ package flash.security; @:native("flash.security.ReferencesValidationSetting") -#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract ReferencesValidationSetting(String) +#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract ReferencesValidationSetting(String) { var NEVER; var VALID_IDENTITY; diff --git a/externs/air/flash/security/RevocationCheckSettings.hx b/externs/air/flash/security/RevocationCheckSettings.hx index 6bfeb017f..983c20365 100644 --- a/externs/air/flash/security/RevocationCheckSettings.hx +++ b/externs/air/flash/security/RevocationCheckSettings.hx @@ -1,7 +1,7 @@ package flash.security; @:native("flash.security.RevocationCheckSettings") -#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract RevocationCheckSettings(String) +#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract RevocationCheckSettings(String) { var ALWAYS_REQUIRED; var BEST_EFFORT; diff --git a/externs/air/flash/security/SignatureStatus.hx b/externs/air/flash/security/SignatureStatus.hx index a8df8686b..c1ce01420 100644 --- a/externs/air/flash/security/SignatureStatus.hx +++ b/externs/air/flash/security/SignatureStatus.hx @@ -1,7 +1,7 @@ package flash.security; @:native("flash.security.SignatureStatus") -#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract SignatureStatus(String) +#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract SignatureStatus(String) { var INVALID; var UNKNOWN; diff --git a/externs/air/flash/security/SignerTrustSettings.hx b/externs/air/flash/security/SignerTrustSettings.hx index 9c3ab6c5f..ec930c7e8 100644 --- a/externs/air/flash/security/SignerTrustSettings.hx +++ b/externs/air/flash/security/SignerTrustSettings.hx @@ -1,7 +1,7 @@ package flash.security; @:native("flash.security.SignerTrustSettings") -#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract SignerTrustSettings(String) +#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract SignerTrustSettings(String) { var CODE_SIGNING; var PLAYLIST_SIGNING; diff --git a/externs/air/flash/text/AutoCapitalize.hx b/externs/air/flash/text/AutoCapitalize.hx index 9c47c449d..3ca9ce87b 100644 --- a/externs/air/flash/text/AutoCapitalize.hx +++ b/externs/air/flash/text/AutoCapitalize.hx @@ -1,7 +1,7 @@ package flash.text; @:native("flash.text.AutoCapitalize") -#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract AutoCapitalize(String) +#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract AutoCapitalize(String) { var ALL; var NONE; diff --git a/externs/air/flash/text/ReturnKeyLabel.hx b/externs/air/flash/text/ReturnKeyLabel.hx index 598b406e3..51156f680 100644 --- a/externs/air/flash/text/ReturnKeyLabel.hx +++ b/externs/air/flash/text/ReturnKeyLabel.hx @@ -1,7 +1,7 @@ package flash.text; @:native("flash.text.ReturnKeyLabel") -#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract ReturnKeyLabel(String) +#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract ReturnKeyLabel(String) { var DEFAULT; var DONE; diff --git a/externs/air/flash/text/SoftKeyboardType.hx b/externs/air/flash/text/SoftKeyboardType.hx index d2080237b..1f6e60f56 100644 --- a/externs/air/flash/text/SoftKeyboardType.hx +++ b/externs/air/flash/text/SoftKeyboardType.hx @@ -1,7 +1,7 @@ package flash.text; @:native("flash.text.SoftKeyboardType") -#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract SoftKeyboardType(String) +#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract SoftKeyboardType(String) { var CONTACT; var DEFAULT; diff --git a/externs/air/flash/text/StageTextClearButtonMode.hx b/externs/air/flash/text/StageTextClearButtonMode.hx index c084af6b6..d7708ab40 100644 --- a/externs/air/flash/text/StageTextClearButtonMode.hx +++ b/externs/air/flash/text/StageTextClearButtonMode.hx @@ -1,7 +1,7 @@ package flash.text; @:native("flash.text.StageTextClearButtonMode") -#if (haxe_ver >= 4.0) extern enum #else @:extern @:enum #end abstract StageTextClearButtonMode(String) +#if (haxe_ver >= 4.0) extern #else @:extern #end enum abstract StageTextClearButtonMode(String) { var ALWAYS; var NEVER; From de7bf3e5edc3f7928bc54a3bd82b596b86627e31 Mon Sep 17 00:00:00 2001 From: Josh Tynjala Date: Mon, 5 Jun 2023 16:03:19 -0700 Subject: [PATCH 2/5] actions: AIR samples --- .github/workflows/main.yml | 46 +++++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 74fc41b9a..7fbbd636c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -550,6 +550,50 @@ jobs: lime build SimpleImage flash -release -verbose -nocolor lime build SimpleAudio flash -release -verbose -nocolor + air-samples: + needs: package-haxelib + runs-on: windows-latest + steps: + + - uses: krdlab/setup-haxe@v1 + with: + haxe-version: 4.2.5 + + - uses: joshtynjala/setup-adobe-air-action@v2 + with: + air-version: "33.1" + accept-license: true + + - name: Set HAXEPATH + run: | + echo "HAXEPATH=$Env:HAXE_STD_PATH\.." >> $Env:GITHUB_ENV + + - name: Install Haxe dependencies + run: | + haxelib git lime-samples https://github.com/openfl/lime-samples --quiet + + - uses: actions/download-artifact@v3 + with: + name: lime-haxelib + path: lime-haxelib + + - name: Prepare lime + run: | + haxelib dev lime lime-haxelib + haxelib run lime setup -alias -y -nocffi + + - name: Create Lime samples + run: | + lime create HelloWorld -verbose -nocolor + lime create SimpleImage -verbose -nocolor + lime create SimpleAudio -verbose -nocolor + + - name: Build Lime samples + run: | + lime build HelloWorld air -release -verbose -nocolor + lime build SimpleImage air -release -verbose -nocolor + lime build SimpleAudio air -release -verbose -nocolor + hashlink-samples: needs: package-haxelib runs-on: ubuntu-20.04 @@ -868,7 +912,7 @@ jobs: notify: runs-on: ubuntu-20.04 - needs: [package-haxelib, docs, android-samples, flash-samples, hashlink-samples, html5-samples, ios-samples, linux-samples, macos-samples, neko-samples, windows-samples] + needs: [package-haxelib, docs, android-samples, flash-samples, air-samples, hashlink-samples, html5-samples, ios-samples, linux-samples, macos-samples, neko-samples, windows-samples] if: ${{ github.repository == 'openfl/lime' && github.event_name != 'pull_request' }} steps: - name: Notify Discord From c8b35c2a09226d295aff2e123930ee247e66e272 Mon Sep 17 00:00:00 2001 From: Josh Tynjala Date: Tue, 6 Jun 2023 10:19:05 -0700 Subject: [PATCH 3/5] actions: lime config AIR_SDK --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7fbbd636c..67581af21 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -581,6 +581,7 @@ jobs: run: | haxelib dev lime lime-haxelib haxelib run lime setup -alias -y -nocffi + haxelib run lime config AIR_SDK ${{ env.AIR_HOME }} - name: Create Lime samples run: | From f6e61b1bac1c49cf51d11537abcb23fb85273023 Mon Sep 17 00:00:00 2001 From: Josh Tynjala Date: Tue, 6 Jun 2023 10:19:39 -0700 Subject: [PATCH 4/5] actions: matrix for AIR --- .github/workflows/main.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 67581af21..e7703f2e0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -553,6 +553,9 @@ jobs: air-samples: needs: package-haxelib runs-on: windows-latest + strategy: + matrix: + haxe-version: [3.4.7, 4.0.5, 4.1.5, 4.2.5, 4.3.1] steps: - uses: krdlab/setup-haxe@v1 From aebf139dc7de2d29dfe7f96a2431ddde2a672943 Mon Sep 17 00:00:00 2001 From: Josh Tynjala Date: Tue, 6 Jun 2023 10:53:45 -0700 Subject: [PATCH 5/5] Fix window show/hide on desktop being incorrectly considered the same as app going into and out of the background/suspend on mobile The app's Timers should still continue when a window is hidden. Especially since an app could have multiple windows, with some being shown and some being hidden. If only one were hidden, the other shown windows would clearly behave in a broken manner because the one hidden window would cause all app timers, even those associated with other windows, to be paused. Introduces new WINDOW_SHOW AND WINDOW_HIDE events from C++ to Haxe, and new onShow and onHide events on Haxe Window. Followup to 0918ee2381b3faf7167d510383e5d97747ee017c --- project/include/ui/WindowEvent.h | 2 ++ project/src/backend/sdl/SDLApplication.cpp | 18 ++---------------- .../backend/native/NativeApplication.hx | 8 ++++++++ src/lime/ui/Window.hx | 2 ++ 4 files changed, 14 insertions(+), 16 deletions(-) diff --git a/project/include/ui/WindowEvent.h b/project/include/ui/WindowEvent.h index 373960ef3..8980e62de 100644 --- a/project/include/ui/WindowEvent.h +++ b/project/include/ui/WindowEvent.h @@ -25,6 +25,8 @@ namespace lime { WINDOW_MOVE, WINDOW_RESIZE, WINDOW_RESTORE, + WINDOW_SHOW, + WINDOW_HIDE }; diff --git a/project/src/backend/sdl/SDLApplication.cpp b/project/src/backend/sdl/SDLApplication.cpp index 7e6014ffa..d7f751e2b 100644 --- a/project/src/backend/sdl/SDLApplication.cpp +++ b/project/src/backend/sdl/SDLApplication.cpp @@ -764,14 +764,9 @@ namespace lime { switch (event->window.event) { - case SDL_WINDOWEVENT_SHOWN: windowEvent.type = WINDOW_ACTIVATE; break; + case SDL_WINDOWEVENT_SHOWN: windowEvent.type = WINDOW_SHOW; break; case SDL_WINDOWEVENT_CLOSE: windowEvent.type = WINDOW_CLOSE; break; - case SDL_WINDOWEVENT_HIDDEN: - - inBackground = true; - windowEvent.type = WINDOW_DEACTIVATE; - break; - + case SDL_WINDOWEVENT_HIDDEN: windowEvent.type = WINDOW_HIDE; break; case SDL_WINDOWEVENT_ENTER: windowEvent.type = WINDOW_ENTER; break; case SDL_WINDOWEVENT_FOCUS_GAINED: windowEvent.type = WINDOW_FOCUS_IN; break; case SDL_WINDOWEVENT_FOCUS_LOST: windowEvent.type = WINDOW_FOCUS_OUT; break; @@ -801,15 +796,6 @@ namespace lime { windowEvent.windowID = event->window.windowID; WindowEvent::Dispatch (&windowEvent); - switch (event->window.event) { - - case SDL_WINDOWEVENT_SHOWN: - - inBackground = false; - break; - - } - } } diff --git a/src/lime/_internal/backend/native/NativeApplication.hx b/src/lime/_internal/backend/native/NativeApplication.hx index 549873fc3..3f4fa50f5 100644 --- a/src/lime/_internal/backend/native/NativeApplication.hx +++ b/src/lime/_internal/backend/native/NativeApplication.hx @@ -561,6 +561,12 @@ class NativeApplication window.__fullscreen = false; window.__minimized = false; window.onRestore.dispatch(); + + case WINDOW_SHOW: + window.onShow.dispatch(); + + case WINDOW_HIDE: + window.onHide.dispatch(); } } } @@ -967,4 +973,6 @@ class NativeApplication var WINDOW_MOVE = 10; var WINDOW_RESIZE = 11; var WINDOW_RESTORE = 12; + var WINDOW_SHOW = 13; + var WINDOW_HIDE = 14; } diff --git a/src/lime/ui/Window.hx b/src/lime/ui/Window.hx index 1cdc8dd73..3f6f7a10d 100644 --- a/src/lime/ui/Window.hx +++ b/src/lime/ui/Window.hx @@ -62,6 +62,7 @@ class Window public var onFocusIn(default, null) = new EventVoid>(); public var onFocusOut(default, null) = new EventVoid>(); public var onFullscreen(default, null) = new EventVoid>(); + public var onHide(default, null) = new EventVoid>(); public var onKeyDown(default, null) = new EventKeyModifier->Void>(); public var onKeyUp(default, null) = new EventKeyModifier->Void>(); public var onLeave(default, null) = new EventVoid>(); @@ -78,6 +79,7 @@ class Window public var onRenderContextRestored(default, null) = new EventVoid>(); public var onResize(default, null) = new EventInt->Void>(); public var onRestore(default, null) = new EventVoid>(); + public var onShow(default, null) = new EventVoid>(); public var onTextEdit(default, null) = new EventInt->Int->Void>(); public var onTextInput(default, null) = new EventVoid>(); public var parameters:Dynamic;