royale-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From carlosrov...@apache.org
Subject [royale-asjs] 25/49: changes to slider
Date Tue, 27 Mar 2018 08:32:20 GMT
This is an automated email from the ASF dual-hosted git repository.

carlosrovira pushed a commit to branch feature/jewel-ui-set
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git

commit 24d3b4af9ddf8be2285d9d15316fcb9c7098507a
Author: Carlos Rovira <carlosrovira@apache.org>
AuthorDate: Mon Mar 19 11:45:14 2018 +0100

    changes to slider
---
 frameworks/projects/Jewel/src/main/resources/defaults.css          | 5 +++++
 .../Jewel/src/main/royale/org/apache/royale/jewel/RadioButton.as   | 2 ++
 .../Jewel/src/main/royale/org/apache/royale/jewel/Slider.as        | 7 ++++---
 frameworks/projects/Jewel/src/main/sass/_global.sass               | 4 ++++
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css b/frameworks/projects/Jewel/src/main/resources/defaults.css
index ece389d..583ef87 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -47,6 +47,11 @@ Slider {
   IBeadView: ClassReference("org.apache.royale.jewel.beads.SliderView");
   IBeadLayout: ClassReference("org.apache.royale.html.beads.layouts.HorizontalSliderLayout");
   IBeadController: ClassReference("org.apache.royale.html.beads.controllers.HSliderMouseController");
+}
+
+.jewel.slider {
+  width: 100px;
+  height: 30px;
   position: relative;
 }
 
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/RadioButton.as
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/RadioButton.as
index 05a5b3d..b4a8e91 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/RadioButton.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/RadioButton.as
@@ -60,6 +60,8 @@ package org.apache.royale.jewel
 		public function RadioButton(upState:DisplayObject=null, overState:DisplayObject=null, downState:DisplayObject=null,
hitTestState:DisplayObject=null)
 		{
 			super(upState, overState, downState, hitTestState);
+
+            typeNames = "jewel radio"
 		}
     }
 
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Slider.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Slider.as
index 9d4f6d9..8d52a61 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Slider.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Slider.as
@@ -23,6 +23,7 @@ package org.apache.royale.jewel
     COMPILE::JS
     {
         import org.apache.royale.core.WrappedHTMLElement;
+		import org.apache.royale.html.util.addElementToWrapper;
     }
 
 	[Event(name="valueChange", type="org.apache.royale.events.Event")]
@@ -56,17 +57,17 @@ package org.apache.royale.jewel
 		public function Slider()
 		{
 			super();
-		}
 
+			typeNames = "jewel slider"
+		}
 		
-
         /**
          * @royaleignorecoercion org.apache.royale.core.WrappedHTMLElement
          */
         COMPILE::JS
         override protected function createElement():WrappedHTMLElement
         {
-			return super.createElement();
+			return addElementToWrapper(this,'div');
         }
     }
 }
diff --git a/frameworks/projects/Jewel/src/main/sass/_global.sass b/frameworks/projects/Jewel/src/main/sass/_global.sass
index 707946e..4233a68 100644
--- a/frameworks/projects/Jewel/src/main/sass/_global.sass
+++ b/frameworks/projects/Jewel/src/main/sass/_global.sass
@@ -46,6 +46,10 @@ Slider
 	IBeadView:  ClassReference("org.apache.royale.jewel.beads.SliderView")
 	IBeadLayout: ClassReference("org.apache.royale.html.beads.layouts.HorizontalSliderLayout")
 	IBeadController: ClassReference("org.apache.royale.html.beads.controllers.HSliderMouseController")
+
+.jewel.slider
+	width: 100px
+	height: 30px
 	position: relative
 
 .SliderTrack

-- 
To stop receiving notification emails like this one, please contact
carlosrovira@apache.org.

Mime
View raw message