You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by bi...@apache.org on 2014/08/17 10:24:27 UTC
[28/47] git commit: [flex-sdk] [refs/heads/develop] - Cleaned up
SpinnerListContainerSkin while working on DateSpinnerSkin Fixed ActionBarSkin
(removed unnecessary bottom padding)
Cleaned up SpinnerListContainerSkin while working on DateSpinnerSkin
Fixed ActionBarSkin (removed unnecessary bottom padding)
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/b2fa2be6
Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/b2fa2be6
Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/b2fa2be6
Branch: refs/heads/develop
Commit: b2fa2be67d17b20f164d37c71200cae731084670
Parents: b019135
Author: Om <bi...@gmail.com>
Authored: Tue Jul 8 17:05:36 2014 -0700
Committer: Om <bi...@gmail.com>
Committed: Tue Jul 8 17:05:36 2014 -0700
----------------------------------------------------------------------
frameworks/projects/mobiletheme/src/android4x.css | 15 ---------------
.../src/spark/skins/android4/ActionBarSkin.as | 18 +-----------------
.../skins/android4/SpinnerListContainerSkin.as | 7 +------
3 files changed, 2 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/b2fa2be6/frameworks/projects/mobiletheme/src/android4x.css
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/android4x.css b/frameworks/projects/mobiletheme/src/android4x.css
index b04cb20..280ca6e 100644
--- a/frameworks/projects/mobiletheme/src/android4x.css
+++ b/frameworks/projects/mobiletheme/src/android4x.css
@@ -144,7 +144,6 @@ Callout#viewNavigatorPopUp
contentBackgroundAppearance: none;
}
-
CheckBox
{
skinClass: ClassReference("spark.skins.android4.CheckBoxSkin");
@@ -307,20 +306,6 @@ ViewNavigator
}
}
-@media (application-dpi: 240)
-{
- global
- {
- fontSize: 20;
- }
-
- ActionBar #titleDisplay
- {
- fontSize: 24;
- }
-
-}
-
@media (application-dpi: 320)
{
global
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/b2fa2be6/frameworks/projects/mobiletheme/src/spark/skins/android4/ActionBarSkin.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/android4/ActionBarSkin.as b/frameworks/projects/mobiletheme/src/spark/skins/android4/ActionBarSkin.as
index d8fbd8f..8ffbe4d 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/android4/ActionBarSkin.as
+++ b/frameworks/projects/mobiletheme/src/spark/skins/android4/ActionBarSkin.as
@@ -91,7 +91,6 @@ public class ActionBarSkin extends MobileSkin
case DPIClassification.DPI_640:
{
borderSize = 2;
- layoutShadowHeight = 12;
layoutContentGroupHeight = 172;
layoutTitleGroupHorizontalPadding = 52;
@@ -99,9 +98,7 @@ public class ActionBarSkin extends MobileSkin
}
case DPIClassification.DPI_480:
{
- // Note provisional may need changes
borderSize = 2;
- layoutShadowHeight = 9;
layoutContentGroupHeight = 130;
layoutTitleGroupHorizontalPadding = 40;
@@ -111,7 +108,6 @@ public class ActionBarSkin extends MobileSkin
case DPIClassification.DPI_320:
{
borderSize = 2;
- layoutShadowHeight = 6;
layoutContentGroupHeight = 86;
layoutTitleGroupHorizontalPadding = 26;
@@ -120,7 +116,6 @@ public class ActionBarSkin extends MobileSkin
case DPIClassification.DPI_240:
{
borderSize = 1;
- layoutShadowHeight = 3;
layoutContentGroupHeight = 65;
layoutTitleGroupHorizontalPadding = 20;
@@ -129,7 +124,6 @@ public class ActionBarSkin extends MobileSkin
case DPIClassification.DPI_120:
{
borderSize = 1;
- layoutShadowHeight = 1.5;
layoutContentGroupHeight = 32;
layoutTitleGroupHorizontalPadding = 10;
@@ -139,7 +133,6 @@ public class ActionBarSkin extends MobileSkin
{
// default DPI_160
borderSize = 1;
- layoutShadowHeight = 3;
layoutContentGroupHeight = 43;
layoutTitleGroupHorizontalPadding = 13;
@@ -175,15 +168,6 @@ public class ActionBarSkin extends MobileSkin
private var borderSize:uint;
/**
- * Height of shadow embedded in borderClass graphic.
- *
- * @langversion 3.0
- * @playerversion AIR 2.5
- * @productversion Flex 4.5
- */
- protected var layoutShadowHeight:uint;
-
- /**
* Default height for navigationGroup, titleGroup and actionGroup.
*
* @langversion 3.0
@@ -434,7 +418,7 @@ public class ActionBarSkin extends MobileSkin
if (border)
{
// FXG uses scale-9, drop shadow is drawn outside the bounds
- setElementSize(border, unscaledWidth, unscaledHeight + layoutShadowHeight);
+ setElementSize(border, unscaledWidth, unscaledHeight);
}
// position groups, overlap of navigation and action groups is allowed
http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/b2fa2be6/frameworks/projects/mobiletheme/src/spark/skins/android4/SpinnerListContainerSkin.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/mobiletheme/src/spark/skins/android4/SpinnerListContainerSkin.as b/frameworks/projects/mobiletheme/src/spark/skins/android4/SpinnerListContainerSkin.as
index dd5ff92..e076a6b 100644
--- a/frameworks/projects/mobiletheme/src/spark/skins/android4/SpinnerListContainerSkin.as
+++ b/frameworks/projects/mobiletheme/src/spark/skins/android4/SpinnerListContainerSkin.as
@@ -66,41 +66,36 @@ package spark.skins.android4
selectionIndicatorClass = spark.skins.android4.assets.SpinnerListContainerSelectionIndicator;
shadowClass = spark.skins.android4.assets.SpinnerListContainerShadow;
cornerRadius = 0;
+ borderThickness = 0;
switch (applicationDPI)
{
case DPIClassification.DPI_640:
{
- borderThickness = 3;
selectionIndicatorHeight = 182;
break;
}
case DPIClassification.DPI_480:
{
- borderThickness = 2;
selectionIndicatorHeight = 144;
break;
}
case DPIClassification.DPI_320:
{
- borderThickness = 2;
selectionIndicatorHeight = 96;
break;
}
case DPIClassification.DPI_240:
{
- borderThickness = 1;
selectionIndicatorHeight = 72;
break;
}
case DPIClassification.DPI_120:
{
- borderThickness = 0;
selectionIndicatorHeight = 36;
break;
}
default: // default DPI_160
{
- borderThickness = 1;
selectionIndicatorHeight = 48;
break;