You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by pe...@apache.org on 2015/10/21 21:41:39 UTC

[1/2] git commit: [flex-asjs] [refs/heads/develop] - Make MobileTrader for flexible for different screen sizes.

Repository: flex-asjs
Updated Branches:
  refs/heads/develop c15290227 -> 866d5e44f


Make MobileTrader for flexible for different screen sizes.


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

Branch: refs/heads/develop
Commit: 820ae80cd4adffb5fe0c1d0bada8ddaed1f7d881
Parents: c152902
Author: Peter Ent <pe...@apache.org>
Authored: Wed Oct 21 15:41:00 2015 -0400
Committer: Peter Ent <pe...@apache.org>
Committed: Wed Oct 21 15:41:00 2015 -0400

----------------------------------------------------------------------
 .../flexjs/MobileTrader/src/MobileTrader.mxml   |  2 +-
 .../flexjs/MobileTrader/src/MyInitialView.mxml  | 29 ++++++++++----------
 .../MobileTrader/src/views/AlertsView.mxml      |  4 +--
 3 files changed, 18 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/820ae80c/examples/flexjs/MobileTrader/src/MobileTrader.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MobileTrader/src/MobileTrader.mxml b/examples/flexjs/MobileTrader/src/MobileTrader.mxml
index 4537ff3..c76531c 100755
--- a/examples/flexjs/MobileTrader/src/MobileTrader.mxml
+++ b/examples/flexjs/MobileTrader/src/MobileTrader.mxml
@@ -34,6 +34,6 @@
 	</js:model>
 	
 	<js:initialView>
-	   <local:MyInitialView width="480" height="640" />
+	   <local:MyInitialView width="100%" height="100%" />
 	</js:initialView>
 </js:Application>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/820ae80c/examples/flexjs/MobileTrader/src/MyInitialView.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MobileTrader/src/MyInitialView.mxml b/examples/flexjs/MobileTrader/src/MyInitialView.mxml
index 1c6b07d..cc99946 100755
--- a/examples/flexjs/MobileTrader/src/MyInitialView.mxml
+++ b/examples/flexjs/MobileTrader/src/MyInitialView.mxml
@@ -43,10 +43,10 @@ limitations under the License.
 		
 		basic|TabbedViewManager {
 			position : absolute ;
-			height : 640px ;
-			width : 480px ;
-			left : 100px ;
-			top : 20px ;
+			height : 100% ;
+			width : 100% ;
+			left : 0px ;
+			top : 0px ;
 			border: solid 1px #444444;
 			background-color: #FFFFFF;
 		}
@@ -82,25 +82,26 @@ limitations under the License.
 		}
 		
 		views|AssetsView {
-			width: 480px;
-			height: 640px;
+			width: 100%;
+			height: 100%;
 		}
 		
 		views|WatchListView {
-			width: 480px;
-			height: 640px;
+			width: 100%;
+			height: 100%;
 			IBeadController:ClassReference('controller.WatchListController');
 			background-color: #FFFFFF;
 		}
 		
 		.WatchListInner {
 			height: 480px;
-			width:  480px;
+			width:  100%;
+			background-color: #FFFFFF;
 		}
 		
 		.WatchListDataGrid {
 			height: 480px;
-			width:  480px;
+			width:  100%;
 		}
 		
 		.WatchListInputArea {
@@ -112,13 +113,13 @@ limitations under the License.
 		}
 		
 		views|StockView {
-			width: 480px;
-			height: 640px;
+			width: 100%;
+			height: 100%;
 		}
 		
 		views|AlertsView {
-			width: 480px;
-			height: 640px;
+			width: 100%;
+			height: 100%;
 			IBeadController:ClassReference('controller.AlertsViewController');
 		}
 		

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/820ae80c/examples/flexjs/MobileTrader/src/views/AlertsView.mxml
----------------------------------------------------------------------
diff --git a/examples/flexjs/MobileTrader/src/views/AlertsView.mxml b/examples/flexjs/MobileTrader/src/views/AlertsView.mxml
index 3bc76bb..6a393de 100755
--- a/examples/flexjs/MobileTrader/src/views/AlertsView.mxml
+++ b/examples/flexjs/MobileTrader/src/views/AlertsView.mxml
@@ -57,9 +57,9 @@ limitations under the License.
 			<js:HorizontalLayout />
 		</js:beads>
 		<js:Label text="Symbol:" />
-		<js:TextInput id="symbolField" />
+		<js:TextInput id="symbolField" width="50" />
 		<js:Label text="Value:" />
-		<js:TextInput id="valueField" />
+		<js:TextInput id="valueField" width="50" />
 		<js:CheckBox text="Higher?" id="higherCheck" />
 		<js:TextButton text="Set" click="onAlertSet()" />
 	</js:Container>


[2/2] git commit: [flex-asjs] [refs/heads/develop] - Stop DataGridView from resizing if the size of the strand is 0x0.

Posted by pe...@apache.org.
Stop DataGridView from resizing if the size of the strand is 0x0.


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

Branch: refs/heads/develop
Commit: 866d5e44f5d5fa4e125af922dd2edcd5ce25f386
Parents: 820ae80
Author: Peter Ent <pe...@apache.org>
Authored: Wed Oct 21 15:41:36 2015 -0400
Committer: Peter Ent <pe...@apache.org>
Committed: Wed Oct 21 15:41:36 2015 -0400

----------------------------------------------------------------------
 .../src/org/apache/flex/html/beads/DataGridView.as | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/866d5e44/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/DataGridView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/DataGridView.as b/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/DataGridView.as
index 7f220e9..e06f569 100644
--- a/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/DataGridView.as
+++ b/frameworks/projects/HTML/asjs/src/org/apache/flex/html/beads/DataGridView.as
@@ -166,15 +166,26 @@ package org.apache.flex.html.beads
 		 */
 		private function handleSizeChanges(event:Event):void
 		{
+			var useWidth:Number = _listArea.width;
+			var useHeight:Number = _listArea.height;
+			
+			if (host.width > 0) {
+				useWidth = host.width;
+			}
+			
 			_header.x = 0;
 			_header.y = 0;
-			_header.width = host.width;
+			_header.width = useWidth;
 			_header.height = 25;
 			
+			if (host.height > 0) {
+				useHeight = host.height - _header.height;
+			}
+			
 			_listArea.x = 0;
 			_listArea.y = 26;
-			_listArea.width = host.width;
-			_listArea.height = host.height - _header.height;
+			_listArea.width = useWidth;
+			_listArea.height = useHeight;
 			
 			var sharedModel:IDataGridModel = _strand.getBeadByType(IBeadModel) as IDataGridModel;