[GitHub] alinakazi closed pull request #285: changes on 5.sep.2018

[GitBox <gi...@apache.org>]

alinakazi closed pull request #285: changes on 5.sep.2018
URL: https://github.com/apache/royale-asjs/pull/285
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/AdvancedDataGrid.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/AdvancedDataGrid.as
index 5725087e8..d4effdaaa 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/AdvancedDataGrid.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/AdvancedDataGrid.as
@@ -877,10 +877,7 @@ public class AdvancedDataGrid extends AdvancedListBase
      */
    // private var headerSelected:Boolean = true;
 
-    /**
-     *  @private
-     */
- //   private var _lockedColumnCountVal:int;
+  
 
     /**
      *  @private
@@ -1160,7 +1157,8 @@ public class AdvancedDataGrid extends AdvancedListBase
     //----------------------------------
     //  lockedColumnCount
     //----------------------------------
-
+    private var _lockedColumnCountVal:int;
+    
     /**
      *  The index of the first column in the control that scrolls. 
      *  Columns to the left of this one remain fixed in view. 
@@ -1175,13 +1173,18 @@ public class AdvancedDataGrid extends AdvancedListBase
      *  @playerversion AIR 1.1
      *  @productversion Royale 0.9.4
      */
-    /* override public function set lockedColumnCount(value:int):void
-    {
+     public function set lockedColumnCount(value:int):void
+     {
         _lockedColumnCountVal = value;
-        lockedColumnCountChanged = true;
+        /* lockedColumnCountChanged = true;
 
-        invalidateProperties();
-    } */
+        invalidateProperties(); */
+     } 
+    
+     public function get lockedColumnCount():int
+     {
+	return _lockedColumnCountVal
+     }
     
     //----------------------------------
     //  columns
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/Button.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/Button.as
index 3e241476d..feb568091 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/Button.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/Button.as
@@ -253,6 +253,17 @@ public class Button extends UIComponent implements IDataRenderer
 		typeNames = "Button";
 	}
 	
+	// ------------------------------------------------
+	//  textDecoration
+	// ------------------------------------------------
+	
+	public function get textDecoration():String
+	{
+		return "none";
+	}
+	public function set textDecoration(value:String):void
+	{
+	}
 	
 	// ------------------------------------------------
 	//  paddingRight
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/advancedDataGridClasses/AdvancedDataGridColumn.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/advancedDataGridClasses/AdvancedDataGridColumn.as
index a3b74d1ff..59596e2ab 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/advancedDataGridClasses/AdvancedDataGridColumn.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/advancedDataGridClasses/AdvancedDataGridColumn.as
@@ -344,7 +344,20 @@ public class AdvancedDataGridColumn
     //  Properties
     //
     //--------------------------------------------------------------------------
-
+    
+    
+    // ------------------------------------------------
+    //  fontWeight
+    // ------------------------------------------------
+	
+    public function get fontWeight():String
+    {
+	return "normal";
+    }
+    public function set fontWeight(value:String):void
+    {
+    }
+    
     //----------------------------------
     //  sortDescending
     //----------------------------------


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services