ButtonBar, PageIndicator, TabBar, AdvancedLayoutViewPort: avoid excep…

…tion when layout is null (references #124)
feathersui · Jul 19, 2022 · eb1d550 · eb1d550
1 parent b7f3f9a
commit eb1d550
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/src/feathers/controls/ButtonBar.hx b/src/feathers/controls/ButtonBar.hx
@@ -479,7 +479,9 @@ class ButtonBar extends FeathersControl {
 		var oldIgnoreChildChanges = this._ignoreChildChanges;
 		this._ignoreChildChanges = true;
 		this._layoutResult.reset();
-		this.layout.layout(this._layoutItems, this._layoutMeasurements, this._layoutResult);
+		if (this.layout != null) {
+			this.layout.layout(this._layoutItems, this._layoutMeasurements, this._layoutResult);
+		}
 		this._ignoreChildChanges = oldIgnoreChildChanges;
 	}
 

diff --git a/src/feathers/controls/PageIndicator.hx b/src/feathers/controls/PageIndicator.hx
@@ -381,7 +381,9 @@ class PageIndicator extends FeathersControl implements IIndexSelector implements
 		var oldIgnoreChildChanges = this._ignoreChildChanges;
 		this._ignoreChildChanges = true;
 		this._layoutResult.reset();
-		this.layout.layout(this._layoutItems, this._layoutMeasurements, this._layoutResult);
+		if (this.layout != null) {
+			this.layout.layout(this._layoutItems, this._layoutMeasurements, this._layoutResult);
+		}
 		this._ignoreChildChanges = oldIgnoreChildChanges;
 	}
 

diff --git a/src/feathers/controls/TabBar.hx b/src/feathers/controls/TabBar.hx
@@ -602,7 +602,9 @@ class TabBar extends FeathersControl implements IIndexSelector implements IDataS
 		var oldIgnoreChildChanges = this._ignoreChildChanges;
 		this._ignoreChildChanges = true;
 		this._layoutResult.reset();
-		this.layout.layout(this._layoutItems, this._layoutMeasurements, this._layoutResult);
+		if (this.layout != null) {
+			this.layout.layout(this._layoutItems, this._layoutMeasurements, this._layoutResult);
+		}
 		this._ignoreChildChanges = oldIgnoreChildChanges;
 	}
 

diff --git a/src/feathers/controls/supportClasses/AdvancedLayoutViewPort.hx b/src/feathers/controls/supportClasses/AdvancedLayoutViewPort.hx
@@ -302,7 +302,9 @@ class AdvancedLayoutViewPort extends FeathersControl implements IViewPort {
 		this.refreshLayoutProperties();
 		this.refreshChildren(this._layoutItems);
 		this._layoutResult.reset();
-		this._layout.layout(this._layoutItems, this._layoutMeasurements, this._layoutResult);
+		if (this._layout != null) {
+			this._layout.layout(this._layoutItems, this._layoutMeasurements, this._layoutResult);
+		}
 		this.handleLayoutResult();
 	}