flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [30/36] git commit: [flex-asjs] [refs/heads/develop] - tweaks to basic ui
Date Tue, 28 Jul 2015 18:40:56 GMT
tweaks to basic ui


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

Branch: refs/heads/develop
Commit: 9bf55616361da63ef7aeb5cbd23d1c3956a78ac5
Parents: cebebe4
Author: Alex Harui <aharui@apache.org>
Authored: Mon Jul 27 23:25:57 2015 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Mon Jul 27 23:25:57 2015 -0700

----------------------------------------------------------------------
 .../flat/supportClasses/DropDownListList.as     | 12 ----
 frameworks/projects/HTML/as/defaults.css        | 34 ++++++++--
 .../apache/flex/html/beads/CSSTextButtonView.as |  4 +-
 .../org/apache/flex/html/beads/CheckBoxView.as  | 12 ++--
 .../flex/html/beads/DownArrowButtonView.as      | 24 +++----
 .../apache/flex/html/beads/DropDownListView.as  | 69 ++++++++++----------
 .../apache/flex/html/beads/RadioButtonView.as   |  8 +--
 .../org/apache/flex/html/beads/TextAreaView.as  | 17 +++--
 .../org/apache/flex/html/beads/TextInputView.as |  7 +-
 .../apache/flex/html/beads/UpArrowButtonView.as | 22 +++----
 .../flex/html/beads/VScrollBarThumbView.as      | 25 +++----
 .../flex/html/beads/VScrollBarTrackView.as      | 12 ++--
 .../html/supportClasses/DropDownListList.as     | 12 ----
 13 files changed, 129 insertions(+), 129 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9bf55616/frameworks/projects/Flat/as/src/org/apache/flex/flat/supportClasses/DropDownListList.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Flat/as/src/org/apache/flex/flat/supportClasses/DropDownListList.as
b/frameworks/projects/Flat/as/src/org/apache/flex/flat/supportClasses/DropDownListList.as
index 097f279..f423d24 100644
--- a/frameworks/projects/Flat/as/src/org/apache/flex/flat/supportClasses/DropDownListList.as
+++ b/frameworks/projects/Flat/as/src/org/apache/flex/flat/supportClasses/DropDownListList.as
@@ -60,17 +60,5 @@ package org.apache.flex.flat.supportClasses
 			super();
             className = "dropdown-menu";
 		}
-		
-        /**
-         *  @private
-         */
-		override public function addedToParent():void
-		{
-			super.addedToParent();
-			
-			var bb:SolidBackgroundBead = new SolidBackgroundBead();
-			bb.backgroundColor = 0xffffff;
-			addBead(bb);
-		}
 	}
 }

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9bf55616/frameworks/projects/HTML/as/defaults.css
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/defaults.css b/frameworks/projects/HTML/as/defaults.css
index 86b2ccb..062e2af 100644
--- a/frameworks/projects/HTML/as/defaults.css
+++ b/frameworks/projects/HTML/as/defaults.css
@@ -35,22 +35,23 @@
 
 Button
 {
-  background-color: #d8d8d8;
-  border: 1px solid #000000;
+  background-color: #f8f8f8;
+  border: 1px solid #808080;
+  border-radius: 2px;
   padding: 4px;
 }
 
 Button:hover
 {
-  background-color: #9fa0a1;
-  border: 1px solid #000000;
+  background-color: #e8e8e8;
+  border: 1px solid #808080;
   padding: 4px;
 }
 
 Button:active
 {
-  background-color: #929496;
-  border: 1px solid #000000;
+  background-color: #d8d8d8;
+  border: 1px solid #808080;
   padding: 4px;
 }
 
@@ -197,6 +198,21 @@ StringItemRenderer
     height: 16;
 }
 
+TextInput
+{
+  border: 1px solid #808080;
+  border-radius: 2px;
+  padding: 4px;
+}
+
+TextArea
+{
+  border: 1px solid #808080;
+  border-radius: 2px;
+  padding: 4px;
+  resize: none;
+}
+
 TitleBar
 {
     IBeadModel: ClassReference("org.apache.flex.html.beads.models.TitleBarModel");
@@ -310,6 +326,12 @@ DropDownListList
     IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.beads.TextItemRendererFactoryForArrayData");
     IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory");
     IItemRenderer: ClassReference("org.apache.flex.html.supportClasses.StringItemRenderer");
+    iBackgroundBead: ClassReference('org.apache.flex.html.beads.SolidBackgroundBead');
+    border-style: solid;
+    border-radius: 4px;
+    border-color: #000000;
+    border-width: 1px;
+    background-color: #FFFFFF;
 }
 
 Image

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9bf55616/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/CSSTextButtonView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/CSSTextButtonView.as
b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/CSSTextButtonView.as
index f400583..b6f65a8 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/CSSTextButtonView.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/CSSTextButtonView.as
@@ -232,8 +232,8 @@ package org.apache.flex.html.beads
 					0, 0, useWidth, useHeight,
 					borderColor, backgroundColor == null ? null : bgColor, borderThickness, bgAlpha,
                     borderEllipseWidth, borderEllipseHeight);
-				textField.y = (useHeight - textField.textHeight) / 2;
-				textField.x = (useWidth - textField.textWidth) / 2;
+				textField.y = ((useHeight - textField.textHeight) / 2) - 2;
+				textField.x = ((useWidth - textField.textWidth) / 2) - 2;
 			}			
 			var backgroundImage:Object = ValuesManager.valuesImpl.getValue(_strand, "background-image",
state);
 			if (backgroundImage)

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9bf55616/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/CheckBoxView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/CheckBoxView.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/CheckBoxView.as
index c666d87..a04f2bf 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/CheckBoxView.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/CheckBoxView.as
@@ -280,16 +280,16 @@ package org.apache.flex.html.beads
 		protected function drawCheckBox(icon:Shape) : void
 		{
 			icon.graphics.clear();
-			icon.graphics.beginFill(0xCCCCCC);
-			icon.graphics.lineStyle(1,0x333333);
+			icon.graphics.beginFill(0xf8f8f8);
+			icon.graphics.lineStyle(1,0x808080);
 			icon.graphics.drawRect(0,0,10,10);
 			icon.graphics.endFill();
 			
 			if( _toggleButtonModel.selected ) {
-				icon.graphics.moveTo(0,0);
-				icon.graphics.lineTo(10,10);
-				icon.graphics.moveTo(10,0);
-				icon.graphics.lineTo(0,10);
+                icon.graphics.lineStyle(2,0);
+				icon.graphics.moveTo(3,4);
+				icon.graphics.lineTo(5,7);
+				icon.graphics.lineTo(9,0);
 			}
 		}
 	}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9bf55616/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/DownArrowButtonView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/DownArrowButtonView.as
b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/DownArrowButtonView.as
index 119b0c7..55e4c67 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/DownArrowButtonView.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/DownArrowButtonView.as
@@ -52,23 +52,23 @@ package org.apache.flex.html.beads
 			downView = new Shape();
 			overView = new Shape();
 
-			drawView(upView.graphics, 0xCCCCCC);
-			drawView(downView.graphics, 0x808080);
-			drawView(overView.graphics, 0xEEEEEE);
+			drawView(upView.graphics, 0xf8f8f8);
+			drawView(downView.graphics, 0xd8d8d8);
+			drawView(overView.graphics, 0xe8e8e8);
 		}
 		
 		private function drawView(g:Graphics, bgColor:uint):void
 		{
-			g.lineStyle(1);
+			g.lineStyle(1, 0x808080);
 			g.beginFill(bgColor);
-			g.drawRect(0, 0, 16, 16);
+			g.drawRoundRect(0, 0, 12, 12, 4);
 			g.endFill();
 			g.lineStyle(0);
 			g.beginFill(0);
-			g.moveTo(4, 4);
-			g.lineTo(12, 4);
-			g.lineTo(8, 12);
-			g.lineTo(4, 4);
+			g.moveTo(3, 3);
+			g.lineTo(9, 3);
+			g.lineTo(6, 9);
+			g.lineTo(3, 3);
 			g.endFill();
 		}
 		
@@ -87,7 +87,7 @@ package org.apache.flex.html.beads
 			super.strand = value;
 			shape = new Shape();
 			shape.graphics.beginFill(0xCCCCCC);
-			shape.graphics.drawRect(0, 0, 16, 16);
+			shape.graphics.drawRect(0, 0, 12, 12);
 			shape.graphics.endFill();
 			SimpleButton(value).upState = upView;
 			SimpleButton(value).downState = downView;
@@ -104,8 +104,8 @@ package org.apache.flex.html.beads
         
         private function sizeChangeHandler(event:Event):void
         {
-            SimpleButton(_strand).scaleX = SimpleButton(_strand).width / 16;
-            SimpleButton(_strand).scaleY = SimpleButton(_strand).height / 16;
+            SimpleButton(_strand).scaleX = SimpleButton(_strand).width / 12;
+            SimpleButton(_strand).scaleY = SimpleButton(_strand).height / 12;
         }
 	}
 }

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9bf55616/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/DropDownListView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/DropDownListView.as
b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/DropDownListView.as
index ec19fae..391350b 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/DropDownListView.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/DropDownListView.as
@@ -26,16 +26,16 @@ package org.apache.flex.html.beads
 	import flash.display.Sprite;
 	import flash.text.TextFieldType;
 	
-    import org.apache.flex.core.BeadViewBase;
+	import org.apache.flex.core.BeadViewBase;
 	import org.apache.flex.core.CSSTextField;
 	import org.apache.flex.core.IBeadView;
 	import org.apache.flex.core.IPopUpHost;
 	import org.apache.flex.core.ISelectionModel;
 	import org.apache.flex.core.IStrand;
-	import org.apache.flex.core.IPopUpHost;
 	import org.apache.flex.core.ValuesManager;
 	import org.apache.flex.events.Event;
 	import org.apache.flex.events.IEventDispatcher;
+    import org.apache.flex.utils.SolidBorderUtil;
     
     /**
      *  The DropDownListView class is the default view for
@@ -70,18 +70,9 @@ package org.apache.flex.html.beads
             upSprite.addChild(upTextField);
             overSprite.addChild(overTextField);
             downSprite.addChild(downTextField);
-            upTextField.border = true;
-            downTextField.border = true;
-            overTextField.border = true;
-            upTextField.background = true;
-            downTextField.background = true;
-            overTextField.background = true;
-            upTextField.borderColor = 0;
-            downTextField.borderColor = 0;
-            overTextField.borderColor = 0;
-            upTextField.backgroundColor = 0xEEEEEE;
-            downTextField.backgroundColor = 0x808080;
-            overTextField.backgroundColor = 0xFFFFFF;
+            upTextField.parentDrawsBackground = true;
+            downTextField.parentDrawsBackground = true;
+            overTextField.parentDrawsBackground = true;
 			upTextField.selectable = false;
 			upTextField.type = TextFieldType.DYNAMIC;
 			downTextField.selectable = false;
@@ -99,9 +90,9 @@ package org.apache.flex.html.beads
             upSprite.addChild(upArrows);
 			overSprite.addChild(overArrows);
 			downSprite.addChild(downArrows);
-            drawArrows(upArrows, 0xEEEEEE);
-            drawArrows(overArrows, 0xFFFFFF);
-            drawArrows(downArrows, 0x808080);
+            drawArrows(upArrows);
+            drawArrows(overArrows);
+            drawArrows(downArrows);
 
 		}
 
@@ -156,16 +147,24 @@ package org.apache.flex.html.beads
             var ww:Number = DisplayObject(_strand).width;
             var hh:Number = DisplayObject(_strand).height;
             
-            upArrows.x = ww - upArrows.width;            
-            overArrows.x = ww - overArrows.width;            
-            downArrows.x = ww - downArrows.width;
-            
+            upArrows.x = ww - upArrows.width - 6;            
+            overArrows.x = ww - overArrows.width - 6;            
+            downArrows.x = ww - downArrows.width - 6;
+            upArrows.y = (hh - upArrows.height) / 2;            
+            overArrows.y = (hh - overArrows.height) / 2;            
+            downArrows.y = (hh - downArrows.height) / 2;
+
 			upTextField.width = upArrows.x;
 			downTextField.width = downArrows.x;
 			overTextField.width = overArrows.x;
 			upTextField.height = hh;
 			downTextField.height = hh;
 			overTextField.height = hh;
+            
+            drawBorder(upSprite, 0xf8f8f8, ww, hh);
+            drawBorder(overSprite, 0xe8e8e8, ww, hh);
+            drawBorder(downSprite, 0xd8d8d8, ww, hh);
+            
 			shape.graphics.clear();
 			shape.graphics.beginFill(0xCCCCCC);
 			shape.graphics.drawRect(0, 0, ww, hh);
@@ -182,26 +181,28 @@ package org.apache.flex.html.beads
         private var downArrows:Shape;
         private var overArrows:Shape;
 		
-        private function drawArrows(shape:Shape, color:uint):void
+        private function drawBorder(sprite:Sprite, color:uint, ww:Number, hh:Number):void
+        {
+            SolidBorderUtil.drawBorder(sprite.graphics, 0, 0,
+                ww, hh,
+                0x808080, color, 1, 1, 4);
+        }
+        
+        private function drawArrows(shape:Shape):void
         {
             var g:Graphics = shape.graphics;
-            g.beginFill(color);
-            g.drawRect(0, 0, 16, 17);
+            g.beginFill(0);
+            g.moveTo(8, 0);
+            g.lineTo(12, 4);
+            g.lineTo(4, 4);
+            g.lineTo(8, 0);
             g.endFill();
             g.beginFill(0);
-            g.moveTo(8, 2);
+            g.moveTo(8, 10);
             g.lineTo(12, 6);
             g.lineTo(4, 6);
-            g.lineTo(8, 2);
-            g.endFill();
-            g.beginFill(0);
-            g.moveTo(8, 14);
-            g.lineTo(12, 10);
-            g.lineTo(4, 10);
-            g.lineTo(8, 14);
+            g.lineTo(8, 10);
             g.endFill();
-            g.lineStyle(1, 0);
-            g.drawRect(0, 0, 16, 17);
         }
             
        /**

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9bf55616/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/RadioButtonView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/RadioButtonView.as
b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/RadioButtonView.as
index 81475f7..245c3d3 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/RadioButtonView.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/RadioButtonView.as
@@ -266,14 +266,14 @@ package org.apache.flex.html.beads
 		protected function drawRadioButton(icon:Shape) : void
 		{
 			icon.graphics.clear();
-			icon.graphics.beginFill(0xCCCCCC);
-			icon.graphics.lineStyle(1,0x333333);
+			icon.graphics.beginFill(0xf8f8f8);
+			icon.graphics.lineStyle(1,0x808080);
 			icon.graphics.drawEllipse(0,0,10,10);
 			icon.graphics.endFill();
 			
 			if( selected ) {
-				icon.graphics.beginFill(0x555555);
-				icon.graphics.drawEllipse(2,2,6,6);
+				icon.graphics.beginFill(0);
+				icon.graphics.drawEllipse(3,3,4,4);
 				icon.graphics.endFill();
 			}
 		}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9bf55616/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/TextAreaView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/TextAreaView.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/TextAreaView.as
index 165eb52..9649240 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/TextAreaView.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/TextAreaView.as
@@ -143,7 +143,7 @@ package org.apache.flex.html.beads
 			vsbm.stepSize = 1;
 			vsbm.value = 0;
 			vsb.model = vsbm;
-			vsb.width = 16;
+			vsb.width = 12;
             IParent(host).addElement(vsb);
 			
 			vsb.addEventListener("scroll", scrollHandler);
@@ -165,20 +165,23 @@ package org.apache.flex.html.beads
 		
 		private function sizeChangedHandler(event:Event):void
 		{
-			var ww:Number = DisplayObject(host).width - DisplayObject(vScrollBar).width;
-			if( !isNaN(ww) && ww > 0 ) {
+			var ww:Number = DisplayObject(host).width;
+            if( !isNaN(ww) && ww > 0 )
+                _border.width = ww;
+            
+            ww -= DisplayObject(vScrollBar).width;
+			if( !isNaN(ww) && ww > 0 )
 				textField.width = ww;
-				_border.width = ww;
-			}
 			
 			var hh:Number = DisplayObject(host).height;
-			if( !isNaN(hh) && hh > 0 ) {
+			if( !isNaN(hh) && hh > 0 ) 
+            {
 				textField.height = hh;
 				_border.height = hh;
 			}
 			
 			var sb:DisplayObject = DisplayObject(vScrollBar);
-			sb.y = 0;
+			sb.y = 1;
 			sb.x = textField.width - 1;
 			sb.height = textField.height;
 		}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9bf55616/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/TextInputView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/TextInputView.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/TextInputView.as
index dcbce38..94bf426 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/TextInputView.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/TextInputView.as
@@ -82,7 +82,12 @@ package org.apache.flex.html.beads
 			if( !isNaN(ww) && ww > 0 ) textField.width = ww;
 			
 			var hh:Number = DisplayObject(host).height;
-			if( !isNaN(hh) && hh > 0 ) textField.height = hh;
+			if( !isNaN(hh) && hh > 0 ) 
+            {
+                textField.height = textField.textHeight + 5;
+            }
+            
+            textField.y = ((hh - textField.height) / 2);
 		}
 	}
 }

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9bf55616/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/UpArrowButtonView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/UpArrowButtonView.as
b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/UpArrowButtonView.as
index 74c4ffd..4f12625 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/UpArrowButtonView.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/UpArrowButtonView.as
@@ -53,23 +53,23 @@ package org.apache.flex.html.beads
 			downView = new Shape();
 			overView = new Shape();
 
-			drawView(upView.graphics, 0xCCCCCC);
-			drawView(downView.graphics, 0x808080);
-			drawView(overView.graphics, 0xEEEEEE);
+			drawView(upView.graphics, 0xf8f8f8);
+			drawView(downView.graphics, 0xd8d8d8);
+			drawView(overView.graphics, 0xe8e8e8);
 		}
 		
 		private function drawView(g:Graphics, bgColor:uint):void
 		{
 			g.lineStyle(1);
 			g.beginFill(bgColor);
-			g.drawRect(0, 0, 16, 16);
+			g.drawRoundRect(0, 0, 12, 12, 4);
 			g.endFill();
 			g.lineStyle(0);
 			g.beginFill(0);
-			g.moveTo(4, 12);
-			g.lineTo(12, 12);
-			g.lineTo(8, 4);
-			g.lineTo(4, 12);
+			g.moveTo(3, 9);
+			g.lineTo(9, 9);
+			g.lineTo(6, 3);
+			g.lineTo(3, 9);
 			g.endFill();
 		}
 		
@@ -88,7 +88,7 @@ package org.apache.flex.html.beads
 			super.strand = value;
 			shape = new Shape();
 			shape.graphics.beginFill(0xCCCCCC);
-			shape.graphics.drawRect(0, 0, 16, 16);
+			shape.graphics.drawRect(0, 0, 12, 12);
 			shape.graphics.endFill();
 			SimpleButton(value).upState = upView;
 			SimpleButton(value).downState = downView;
@@ -105,8 +105,8 @@ package org.apache.flex.html.beads
 		
         private function sizeChangeHandler(event:Event):void
         {
-            SimpleButton(_strand).scaleX = SimpleButton(_strand).width / 16;
-            SimpleButton(_strand).scaleY = SimpleButton(_strand).height / 16;
+            SimpleButton(_strand).scaleX = SimpleButton(_strand).width / 12;
+            SimpleButton(_strand).scaleY = SimpleButton(_strand).height / 12;
         }
 	}
 }

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9bf55616/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/VScrollBarThumbView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/VScrollBarThumbView.as
b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/VScrollBarThumbView.as
index 79794d8..6578a82 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/VScrollBarThumbView.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/VScrollBarThumbView.as
@@ -58,15 +58,8 @@ package org.apache.flex.html.beads
             g.clear();
 			g.lineStyle(1);
 			g.beginFill(bgColor);
-			g.drawRect(0, 0, 16, hh);
+			g.drawRoundRect(0, 0, 12, hh, 6);
 			g.endFill();
-            hh = Math.round(hh / 2);
-			g.moveTo(4, hh);
-			g.lineTo(12, hh);
-			g.moveTo(4, hh - 4);
-			g.lineTo(12, hh - 4);
-			g.moveTo(4, hh + 4);
-			g.lineTo(12, hh + 4);
 		}
 		
 		private var shape:Shape;
@@ -87,13 +80,13 @@ package org.apache.flex.html.beads
             downView = new Shape();
             overView = new Shape();
             
-            drawView(upView.graphics, 0xCCCCCC);
-            drawView(downView.graphics, 0x808080);
-            drawView(overView.graphics, 0xEEEEEE);
+            drawView(upView.graphics, 0xc8c8c8);
+            drawView(downView.graphics, 0xa8a8a8);
+            drawView(overView.graphics, 0xb8b8b8);
 
             shape = new Shape();
 			shape.graphics.beginFill(0xCCCCCC);
-			shape.graphics.drawRect(0, 0, 16, 16);
+			shape.graphics.drawRect(0, 0, 12, 12);
 			shape.graphics.endFill();
 			SimpleButton(value).upState = upView;
 			SimpleButton(value).downState = downView;
@@ -108,13 +101,13 @@ package org.apache.flex.html.beads
 			DisplayObject(_strand).scaleX = 1.0;
 			
             var hh:Number = DisplayObject(_strand).height;
-            drawView(upView.graphics, 0xCCCCCC);
-            drawView(downView.graphics, 0x808080);
-            drawView(overView.graphics, 0xEEEEEE);
+            drawView(upView.graphics, 0xC8c8c8);
+            drawView(downView.graphics, 0xa8a8a8);
+            drawView(overView.graphics, 0xb8b8b8);
             
             shape.graphics.clear();
             shape.graphics.beginFill(0xCCCCCC);
-            shape.graphics.drawRect(0, 0, 16, hh);
+            shape.graphics.drawRect(0, 0, 12, hh);
             shape.graphics.endFill();
         }
         

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9bf55616/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/VScrollBarTrackView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/VScrollBarTrackView.as
b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/VScrollBarTrackView.as
index 884c57b..e040b7e 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/VScrollBarTrackView.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/VScrollBarTrackView.as
@@ -58,9 +58,9 @@ package org.apache.flex.html.beads
 		private function drawView(g:Graphics, bgColor:uint, h:Number):void
 		{
 			g.clear();
-			g.lineStyle(1);
+			g.lineStyle(1, 0x808080);
 			g.beginFill(bgColor);
-			g.drawRect(0, 0, 16, h);
+			g.drawRect(0, 0, 12, h);
 			g.endFill();
 			g.lineStyle(0);
 		}
@@ -72,12 +72,12 @@ package org.apache.flex.html.beads
 			
 			var h:Number = SimpleButton(_strand).height;
 			
-			drawView(upView.graphics, 0xCCCCCC, h);
-			drawView(downView.graphics, 0x808080, h);
-			drawView(overView.graphics, 0xEEEEEE, h);	
+			drawView(upView.graphics, 0xf8f8f8, h);
+			drawView(downView.graphics, 0xd8d8d8, h);
+			drawView(overView.graphics, 0xe8e8e8, h);	
 			shape.graphics.clear();
 			shape.graphics.beginFill(0xCCCCCC);
-			shape.graphics.drawRect(0, 0, 16, h);
+			shape.graphics.drawRect(0, 0, 12, h);
 			shape.graphics.endFill();
 			
 		}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9bf55616/frameworks/projects/HTML/as/src/org/apache/flex/html/supportClasses/DropDownListList.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/supportClasses/DropDownListList.as
b/frameworks/projects/HTML/as/src/org/apache/flex/html/supportClasses/DropDownListList.as
index b2a8a14..6bc1d43 100644
--- a/frameworks/projects/HTML/as/src/org/apache/flex/html/supportClasses/DropDownListList.as
+++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/supportClasses/DropDownListList.as
@@ -59,17 +59,5 @@ package org.apache.flex.html.supportClasses
 		{
 			super();
 		}
-		
-        /**
-         *  @private
-         */
-		override public function addedToParent():void
-		{
-			super.addedToParent();
-			
-			var bb:SolidBackgroundBead = new SolidBackgroundBead();
-			bb.backgroundColor = 0xffffff;
-			addBead(bb);
-		}
 	}
 }


Mime
View raw message