You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2017/05/13 06:00:28 UTC

[12/12] git commit: [flex-asjs] [refs/heads/release0.8.0] - panel needs to apply layout to custom titlebars as well

panel needs to apply layout to custom titlebars as well


Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/8785ca0b
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/8785ca0b
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/8785ca0b

Branch: refs/heads/release0.8.0
Commit: 8785ca0b7da691edca56a2a995bf7d8b397e7ec7
Parents: 7f65283
Author: Alex Harui <ah...@apache.org>
Authored: Fri May 12 22:45:06 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri May 12 22:46:59 2017 -0700

----------------------------------------------------------------------
 .../org/apache/flex/html/beads/PanelView.as     | 26 +++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8785ca0b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/PanelView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/PanelView.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/PanelView.as
index 43af3f8..167e26a 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/PanelView.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/PanelView.as
@@ -135,23 +135,25 @@ package org.apache.flex.html.beads
 
             if (!_titleBar) {
                 _titleBar = new TitleBar();
-				_titleBar.id = "panelTitleBar";
+			}
+			
+			_titleBar.id = "panelTitleBar";
 
-				COMPILE::SWF {
-					_titleBar.percentWidth = 100;
+			COMPILE::SWF {
+				_titleBar.percentWidth = 100;
 
-					if (_titleBar.style == null) {
-						_titleBar.style = new SimpleCSSStyles();
-					}
-					_titleBar.style.flexGrow = 0;
-					_titleBar.style.order = 1;
+				if (_titleBar.style == null) {
+					_titleBar.style = new SimpleCSSStyles();
 				}
+				_titleBar.style.flexGrow = 0;
+				_titleBar.style.order = 1;
+			}
 
-				COMPILE::JS {
-					_titleBar.element.style["flex-grow"] = "0";
-					_titleBar.element.style["order"] = "1";
-				}
+			COMPILE::JS {
+				_titleBar.element.style["flex-grow"] = "0";
+				_titleBar.element.style["order"] = "1";
 			}
+
 			// replace the TitleBar's model with the Panel's model (it implements ITitleBarModel) so that
 			// any changes to values in the Panel's model that correspond values in the TitleBar will
 			// be picked up automatically by the TitleBar.