From a539551db56ebc47b109ff736ec2105ea7b219c4 Mon Sep 17 00:00:00 2001 From: Piotr Zarzycki Date: Fri, 30 Aug 2024 09:27:24 +0200 Subject: [PATCH] Using new property showPageIndicator - Switch to official build of lime 8.1.3 - Update hxcpp to 4.3.62 (reference #122) --- .github/workflows/sub-build-linux.yml | 5 ++--- .github/workflows/sub-build-macos.yml | 5 ++--- .github/workflows/sub-build-windows.yml | 5 ++--- .../application/components/GenesisNavigator.hx | 6 ++---- .../application/theme/GenesisApplicationTheme.hx | 11 ----------- 5 files changed, 8 insertions(+), 24 deletions(-) diff --git a/.github/workflows/sub-build-linux.yml b/.github/workflows/sub-build-linux.yml index 9888757d..48aa6e93 100644 --- a/.github/workflows/sub-build-linux.yml +++ b/.github/workflows/sub-build-linux.yml @@ -110,13 +110,12 @@ jobs: if: ${{ !inputs.caching || !steps.cache-bin.outputs.cache-hit }} working-directory: Build run: | - haxelib git hxcpp https://github.com/HaxeFoundation/hxcpp.git v4.3.56 + haxelib git hxcpp https://github.com/HaxeFoundation/hxcpp.git v4.3.62 pushd . cd /opt/hostedtoolcache/haxe/4.3.4/x64/lib/hxcpp/git/tools/hxcpp haxe compile.hxml popd - git clone --recursive --depth 1 --branch 8.2.0-Dev https://github.com/openfl/lime - haxelib dev lime lime + haxelib install lime 8.1.3 haxelib install format haxelib install hxp haxelib install yaml diff --git a/.github/workflows/sub-build-macos.yml b/.github/workflows/sub-build-macos.yml index 15b05653..d2ebcffd 100644 --- a/.github/workflows/sub-build-macos.yml +++ b/.github/workflows/sub-build-macos.yml @@ -99,13 +99,12 @@ jobs: if: ${{ !inputs.caching || !steps.cache-bin.outputs.cache-hit }} working-directory: Build run: | - haxelib git hxcpp https://github.com/HaxeFoundation/hxcpp.git v4.3.56 + haxelib git hxcpp https://github.com/HaxeFoundation/hxcpp.git v4.3.62 pushd . cd /Users/runner/hostedtoolcache/haxe/4.3.4/x64/lib/hxcpp/git/tools/hxcpp haxe compile.hxml popd - git clone --recursive --depth 1 --branch 8.3.0-Dev https://github.com/openfl/lime - haxelib dev lime lime + haxelib install lime 8.1.3 haxelib install format haxelib install hxp haxelib install yaml diff --git a/.github/workflows/sub-build-windows.yml b/.github/workflows/sub-build-windows.yml index 12008803..0e0c3a1e 100644 --- a/.github/workflows/sub-build-windows.yml +++ b/.github/workflows/sub-build-windows.yml @@ -99,13 +99,12 @@ jobs: if: ${{ !inputs.caching || !steps.cache-bin.outputs.cache-hit }} working-directory: Build run: | - haxelib git hxcpp https://github.com/HaxeFoundation/hxcpp.git v4.3.56 + haxelib git hxcpp https://github.com/HaxeFoundation/hxcpp.git v4.3.62 pushd . cd C:\hostedtoolcache\windows\haxe\4.3.4\x64\lib\hxcpp\git\tools\hxcpp haxe compile.hxml popd - git clone --recursive --depth 1 --branch 8.2.0-Dev https://github.com/openfl/lime - haxelib dev lime lime + haxelib install lime 8.1.3 haxelib install format haxelib install hxp haxelib install yaml diff --git a/Genesis/Source/genesis/application/components/GenesisNavigator.hx b/Genesis/Source/genesis/application/components/GenesisNavigator.hx index 958e59ce..b00e8008 100644 --- a/Genesis/Source/genesis/application/components/GenesisNavigator.hx +++ b/Genesis/Source/genesis/application/components/GenesisNavigator.hx @@ -31,7 +31,6 @@ package genesis.application.components; import feathers.controls.navigators.PageNavigator; -import genesis.application.theme.GenesisApplicationTheme; class GenesisNavigator extends PageNavigator { @@ -44,9 +43,8 @@ class GenesisNavigator extends PageNavigator { override function initialize() { super.initialize(); - - this.customPageIndicatorVariant = GenesisApplicationTheme.PAGE_INDICATOR_INVISIBLE; - + + this.showPageIndicator = false; } } \ No newline at end of file diff --git a/Genesis/Source/genesis/application/theme/GenesisApplicationTheme.hx b/Genesis/Source/genesis/application/theme/GenesisApplicationTheme.hx index b5750e0f..1197575e 100644 --- a/Genesis/Source/genesis/application/theme/GenesisApplicationTheme.hx +++ b/Genesis/Source/genesis/application/theme/GenesisApplicationTheme.hx @@ -42,7 +42,6 @@ import feathers.controls.FormItem; import feathers.controls.Header; import feathers.controls.Label; import feathers.controls.LayoutGroup; -import feathers.controls.PageIndicator; import feathers.controls.PopUpListView; import feathers.controls.TextArea; import feathers.controls.TextInput; @@ -118,7 +117,6 @@ class GenesisApplicationTheme extends ClassVariantTheme { public static final LAYOUT_GROUP_TOAST:String = "layout-group-toast"; public static final LAYOUT_GROUP_TOAST_CONTAINER:String = "layout-group-toast-container"; public static final LAYOUT_GROUP_PERCENTAGE_BAR:String = "layout-group-percentage-bar"; - public static final PAGE_INDICATOR_INVISIBLE:String = "page-indicator-invisible"; public static final TEXT_AREA_PRIVACY:String = "text-area-privacy"; public static final ICON_CHECKBOX_LARGE:String = "assets/images/common/checkbox_large.png"; @@ -328,7 +326,6 @@ class GenesisApplicationTheme extends ClassVariantTheme { this.styleProvider.setStyleFunction( MainMenuButton, null, _setMainMenuButtonStyles ); this.styleProvider.setStyleFunction( Page, LAYOUT_GROUP_LOGIN, _setPageLoginStyles ); this.styleProvider.setStyleFunction( Page, null, _setPageStyles ); - this.styleProvider.setStyleFunction( PageIndicator, PAGE_INDICATOR_INVISIBLE, _setPageIndicatorInvisibleStyles ); this.styleProvider.setStyleFunction( ProgressBar, null, _setProgressBarStyles ); this.styleProvider.setStyleFunction( TextArea, TEXT_AREA_PRIVACY, _setTextAreaPrivacyStyles ); this.styleProvider.setStyleFunction( TextInput, null, _setTextInputStyles ); @@ -709,14 +706,6 @@ class GenesisApplicationTheme extends ClassVariantTheme { } - - function _setPageIndicatorInvisibleStyles( indicator:PageIndicator ) { - - indicator.layout = new HorizontalLayout(); - indicator.visible = indicator.includeInLayout = false; - - } - function _setPopUpListViewButtonStyles( button:Button ) { _setButtonStyles( button );