flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [46/50] [abbrv] git commit: [flex-asjs] [refs/heads/core_js_to_as] - Merge branch 'develop' into core_js_to_as
Date Thu, 08 Oct 2015 18:51:48 GMT
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/10ac8d8c/frameworks/projects/Core/as/src/org/apache/flex/core/IViewportModel.as
----------------------------------------------------------------------
diff --cc frameworks/projects/Core/as/src/org/apache/flex/core/IViewportModel.as
index 7566a04,a1a0b7b..3cc7040
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/IViewportModel.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/IViewportModel.as
@@@ -1,98 -1,50 +1,51 @@@
+ ////////////////////////////////////////////////////////////////////////////////
+ //
+ //  Licensed to the Apache Software Foundation (ASF) under one or more
+ //  contributor license agreements.  See the NOTICE file distributed with
+ //  this work for additional information regarding copyright ownership.
+ //  The ASF licenses this file to You under the Apache License, Version 2.0
+ //  (the "License"); you may not use this file except in compliance with
+ //  the License.  You may obtain a copy of the License at
+ //
+ //      http://www.apache.org/licenses/LICENSE-2.0
+ //
+ //  Unless required by applicable law or agreed to in writing, software
+ //  distributed under the License is distributed on an "AS IS" BASIS,
+ //  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ //  See the License for the specific language governing permissions and
+ //  limitations under the License.
+ //
+ ////////////////////////////////////////////////////////////////////////////////
  package org.apache.flex.core
  {
+     import org.apache.flex.geom.Rectangle;
+     
  	/**
- 	 * A Viewport is a window onto an area of content. A viewport is given space
- 	 * in which to operate by a View bead and given this model with the properties
- 	 * necessary for its function.
+ 	 * A Viewport is the area of a Container set aside for displaying
+      * content and any scrolling controls.
+      * The ViewportModel caches the offsets required to compute the size
+      * of the Viewport.
  	 */
 -	public interface IViewportModel extends IBead
 +	COMPILE::AS3
 +	public interface IViewportModel extends IBeadModel
  	{	
- 		// Layout and Content
- 		
- 		/**
- 		 * Returns true (or set to true) when the contentArea is
- 		 * actually the same as the host strand.
- 		 */
- 		function get contentIsHost():Boolean;
- 		function set contentIsHost(value:Boolean):void;
- 		
- 		/**
- 		 * The content area being managed by the viewport
- 		 */
- 		function get contentArea():IUIBase;
- 		function set contentArea(value:IUIBase):void;
- 		
- 		// Viewport Position and Dimensions
- 		
- 		/**
- 		 * The x position of the viewport space as allocated by the View.
- 		 */
- 		function get viewportX():Number;
- 		function set viewportX(value:Number):void;
- 		
- 		/**
- 		 * The y position of the viewport space as allocated by the View.
- 		 */
- 		function get viewportY():Number;
- 		function set viewportY(value:Number):void;
- 		
- 		/**
- 		 * The width of the viewport space as allocated by the View.
- 		 */
- 		function get viewportWidth():Number;
- 		function set viewportWidth(value:Number):void;
- 		
- 		/**
- 		 * The height of the viewport space as allocated by the View.
- 		 */
- 		function get viewportHeight():Number;
- 		function set viewportHeight(value:Number):void;
- 		
- 		// Content Area Size and Position
- 		
- 		/**
- 		 * The position of the content area within the viewport. This may
- 		 * be an offset from the viewportX due to padding.
- 		 */
- 		function get contentX():Number;
- 		function set contentX(value:Number):void;
- 		
  		/**
- 		 * The position of the content area within the viewport. This may
- 		 * be an offset from the viewportY due to padding.
- 		 */
- 		function get contentY():Number;
- 		function set contentY(value:Number):void;
- 		
- 		/**
- 		 * The width of the content area within the viewport. The width is
- 		 * determined by the content itself, mostly due to the use of 
- 		 * a layout.
- 		 */
- 		function get contentWidth():Number;
- 		function set contentWidth(value:Number):void;
- 		
- 		/**
- 		 * The height of the content area within the viewport. The height
- 		 * is determined by the content itself, mostly due to the use of
- 		 * a layout.
- 		 */
- 		function get contentHeight():Number;
- 		function set contentHeight(value:Number):void;
- 		
- 		// Scrolling Parameters
- 		
- 		/**
- 		 * The top position of the content area that is visible in the viewport.
- 		 */
- 		function get verticalScrollPosition():Number;
- 		function set verticalScrollPosition(value:Number):void;
- 		
- 		/**
- 		 * The left position of the content area that is visible in the viewport.
- 		 */
- 		function get horizontalScrollPosition():Number;
- 		function set horizontalScrollPosition(value:Number):void;
+ 		 * Size of the borders.
+ 		 */
+ 		function get borderMetrics():Rectangle;
+ 		function set borderMetrics(value:Rectangle):void;
+ 		
+         /**
+          * Size of the chrome.  A plain container doesn't have any chrome
+          * but a Panel's TitleBar and any ControlBar or StatusBar is
+          * considered chrome.  Scrollbars used to scroll content are
+          * not factored into the viewport calculation.  The Viewport
+          * is responsible for displaying any scrolling controls and
+          * deciding whether to further shrink the content area or
+          * have the scrollbars overlay the content.
+          */
+         function get chromeMetrics():Rectangle;
+         function set chromeMetrics(value:Rectangle):void;
+         
  	}
 -}
 +}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/10ac8d8c/frameworks/projects/Core/as/src/org/apache/flex/core/SimpleCSSValuesImpl.as
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/10ac8d8c/frameworks/projects/Core/as/src/org/apache/flex/core/SimpleValuesImpl.as
----------------------------------------------------------------------
diff --cc frameworks/projects/Core/as/src/org/apache/flex/core/SimpleValuesImpl.as
index 0c1a614,23eec41..b567300
--- a/frameworks/projects/Core/as/src/org/apache/flex/core/SimpleValuesImpl.as
+++ b/frameworks/projects/Core/as/src/org/apache/flex/core/SimpleValuesImpl.as
@@@ -164,5 -163,20 +164,20 @@@ package org.apache.flex.cor
              return JSON.parse("{" + value + "}");
          }
  
+         /**
+          *  @copy org.apache.flex.core.IValuesImpl#addRule()
+          *  
+          *  @langversion 3.0
+          *  @playerversion Flash 10.2
+          *  @playerversion AIR 2.6
+          *  @productversion FlexJS 0.0
+          */
+         public function addRule(ruleName:String, values:Object):void
+         {
+             // ignore ruleName since all values are global
+             for (var p:String in values)
+                 values[p] = values[p];
+         }
+         
      }
 -}
 +}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/10ac8d8c/frameworks/projects/Core/as/src/org/apache/flex/core/UIBase.as
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/10ac8d8c/frameworks/projects/Core/as/src/org/apache/flex/core/UIButtonBase.as
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/10ac8d8c/frameworks/projects/Core/as/src/org/apache/flex/core/ViewBase.as
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/10ac8d8c/frameworks/projects/Core/asjs/src/org/apache/flex/core/BindableCSSStyles.as
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/10ac8d8c/frameworks/projects/Core/asjs/src/org/apache/flex/core/SimpleCSSStyles.as
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/10ac8d8c/frameworks/projects/Core/basic-manifest.xml
----------------------------------------------------------------------
diff --cc frameworks/projects/Core/basic-manifest.xml
index 2da70e8,97a664b..6eb5ae0
--- a/frameworks/projects/Core/basic-manifest.xml
+++ b/frameworks/projects/Core/basic-manifest.xml
@@@ -22,7 -22,8 +22,9 @@@
  <componentPackage>
  
      <component id="Application" class="org.apache.flex.core.Application"/>
 +    <!-- temporarily remove these classes while we try to get Application to compile
+     <component id="BrowserScroller" class="org.apache.flex.core.BrowserScroller"/>
+     <component id="BrowserResizeHandler" class="org.apache.flex.core.BrowserResizeListener"/>
      <component id="SimpleValuesImpl" class="org.apache.flex.core.SimpleValuesImpl"/>
      <component id="SimpleCSSValuesImpl" class="org.apache.flex.core.SimpleCSSValuesImpl"/>
      <component id="ViewBase" class="org.apache.flex.core.ViewBase"/>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/10ac8d8c/frameworks/projects/Core/compile-asjs-config.xml
----------------------------------------------------------------------


Mime
View raw message