Skip to content

Commit 68bb9bf

Browse files
committed
Update for OpenFL 8
Plus fixes
1 parent db5515d commit 68bb9bf

File tree

4 files changed

+4
-5
lines changed

4 files changed

+4
-5
lines changed

haxe/ui/backend/AssetsBase.hx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import haxe.ui.assets.FontInfo;
1212
import haxe.ui.assets.ImageInfo;
1313
import haxe.ui.util.ByteConverter;
1414
import openfl.Assets;
15-
import openfl.Assets.AssetType;
15+
import openfl.utils.AssetType;
1616

1717
class AssetsBase {
1818

haxe/ui/backend/ComponentBase.hx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ class ComponentBase extends FlxSpriteGroup implements IComponentBase {
120120

121121
while (indexOffset < members.length) {
122122
if (!Std.is(members[indexOffset], Component)) indexOffset++;
123+
else break;
123124
}
124125

125126
insert(index + indexOffset, child);

haxe/ui/backend/ScreenBase.hx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ class ScreenBase {
2525

2626
if (options != null && options.container != null) {
2727
var fg:FlxGroup = options.container;
28-
fg.memberAdded.remove(FlxUIHelper.readyUI);
28+
if (fg.exists) fg.memberAdded.remove(FlxUIHelper.readyUI);
29+
else options.container = null; // clean up references to destroyed containers
2930
}
3031

3132
options = tko;

haxe/ui/backend/TextDisplayBase.hx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,6 @@ class TextDisplayBase {
5151

5252
if (_textStyle.color != null) tf.color = _textStyle.color;
5353

54-
if (_textStyle.width != null) tf.fieldWidth = tf.width = _textStyle.width;
55-
if (_textStyle.height != null) tf.textField.height = tf.height = _textStyle.height;
56-
5754
if (tf.wordWrap != _displayData.wordWrap) tf.wordWrap = _displayData.wordWrap;
5855
if (tf.textField.multiline != _displayData.multiline) tf.textField.multiline = _displayData.multiline;
5956

0 commit comments

Comments
 (0)