You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ca...@apache.org on 2020/08/28 16:06:41 UTC
[royale-asjs] branch develop updated: jewel-tabbar: remove baked
layout and scrolling to accept layout and viewport beads (For scrolling now
need to add ScrollingViewPort). clean dead code commented long time ago.
This is an automated email from the ASF dual-hosted git repository.
carlosrovira pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 949a2a8 jewel-tabbar: remove baked layout and scrolling to accept layout and viewport beads (For scrolling now need to add ScrollingViewPort). clean dead code commented long time ago.
949a2a8 is described below
commit 949a2a8432f86b2a14737b8ef2540318b59e1b3a
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Fri Aug 28 18:06:27 2020 +0200
jewel-tabbar: remove baked layout and scrolling to accept layout and viewport beads (For scrolling now need to add ScrollingViewPort). clean dead code commented long time ago.
---
.../projects/Jewel/src/main/resources/defaults.css | 16 ++------
.../main/royale/org/apache/royale/jewel/TabBar.as | 43 +++++-----------------
.../itemRenderers/TabBarButtonItemRenderer.as | 40 --------------------
.../Jewel/src/main/sass/components/_tabbar.sass | 23 ++++++------
.../JewelTheme/src/main/resources/defaults.css | 8 +++-
.../src/main/sass/components-primary/_tabbar.sass | 11 ++++--
6 files changed, 38 insertions(+), 103 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css b/frameworks/projects/Jewel/src/main/resources/defaults.css
index d0e1481..cf5cf53 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -3643,12 +3643,11 @@ j|Snackbar {
}
.jewel.tabbar {
- display: flex;
- overflow-y: hidden;
- overflow-x: scroll;
-webkit-overflow-scrolling: touch;
-ms-overflow-style: -ms-autohiding-scrollbar !important;
scrollbar-width: none;
+ transform: none;
+ will-change: transform;
}
.jewel.tabbar::-webkit-scrollbar {
display: none !important;
@@ -3659,18 +3658,11 @@ j|Snackbar {
.jewel.tabbar::-webkit-scrollbar-thumb {
display: none !important;
}
-.jewel.tabbar > .content {
- display: flex;
- position: relative;
- flex: 1 0 auto;
- transform: none;
- will-change: transform;
-}
j|TabBar {
IBeadView: ClassReference("org.apache.royale.jewel.beads.views.TabBarView");
IBeadController: ClassReference("org.apache.royale.jewel.beads.controllers.ListSingleSelectionMouseController");
- IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.NullLayout");
+ IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.HorizontalLayout");
IItemRendererClassFactory: ClassReference("org.apache.royale.core.SelectableItemRendererClassFactory");
IItemRenderer: ClassReference("org.apache.royale.jewel.itemRenderers.TabBarButtonItemRenderer");
IItemRendererInitializer: ClassReference("org.apache.royale.jewel.beads.itemRenderers.TabBarItemRendererInitializer");
@@ -3685,7 +3677,7 @@ j|TabBar {
padding: 0 24px;
position: relative;
display: flex;
- flex: 1 0 auto;
+ flex: 1 0 auto !important;
white-space: nowrap;
justify-content: center;
z-index: 1;
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/TabBar.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/TabBar.as
index c7fd328..e9e28c9 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/TabBar.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/TabBar.as
@@ -18,11 +18,6 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.jewel
{
- COMPILE::JS
- {
- import org.apache.royale.core.WrappedHTMLElement;
- import org.apache.royale.html.util.addElementToWrapper;
- }
import org.apache.royale.events.MouseEvent;
import org.apache.royale.core.ISelectionModel;
@@ -74,35 +69,6 @@ package org.apache.royale.jewel
}
}
- /**
- * @royaleignorecoercion org.apache.royale.core.WrappedHTMLElement
- */
- COMPILE::JS
- override protected function createElement():WrappedHTMLElement
- {
- addElementToWrapper(this,'div');
- element.className = "content";
- positioner = document.createElement('div') as WrappedHTMLElement;
- return element;
- }
-
- COMPILE::JS
- private var _positioner:WrappedHTMLElement;
-
- COMPILE::JS
- override public function get positioner():WrappedHTMLElement
- {
- return _positioner;
- }
-
- COMPILE::JS
- override public function set positioner(value:WrappedHTMLElement):void
- {
- _positioner = value;
- _positioner.royale_wrapper = this;
- _positioner.appendChild(element);
- }
-
private var _sameWidths:Boolean = false;
/**
* Assigns variable gap to grid from 1 to 20
@@ -129,5 +95,14 @@ package org.apache.royale.jewel
toggleClass("sameWidths", _sameWidths);
}
}
+
+ /**
+ * Load the layout bead if it hasn't already been loaded.
+ *
+ * @private
+ */
+ // override protected function addLayoutBead():void {
+ // // we need to proxy the layout bead to the content in TabBarView
+ // }
}
}
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/TabBarButtonItemRenderer.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/TabBarButtonItemRenderer.as
index 1ca26f6..e99642e 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/TabBarButtonItemRenderer.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/itemRenderers/TabBarButtonItemRenderer.as
@@ -55,24 +55,6 @@ package org.apache.royale.jewel.itemRenderers
typeNames = "jewel tabbarbutton";
}
- // private var _href:String = "#";
- /**
- * the navigation link url
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.4
- */
- // public function get href():String
- // {
- // return _href;
- // }
- // public function set href(value:String):void
- // {
- // _href = value;
- // }
-
private var _text:String = "";
[Bindable(event="textChange")]
@@ -118,20 +100,6 @@ package org.apache.royale.jewel.itemRenderers
{
text = getLabelFromData(this, value);
super.data = value;
-
- // if(value.href !== undefined)
- // {
- // href = String(value.href);
- // }
-
- // COMPILE::JS
- // {
- // if(textNode != null)
- // {
- // textNode.nodeValue = text;
- // (element as HTMLElement).setAttribute('href', href);
- // }
- // }
}
COMPILE::JS
@@ -161,14 +129,6 @@ package org.apache.royale.jewel.itemRenderers
indicator_content = document.createElement('span') as HTMLSpanElement;
indicator_content.className = "indicatorContent";
indicator.appendChild(indicator_content);
-
- //a.setAttribute('href', href);
-
- // if(MXMLDescriptor == null)
- // {
- // textNode = document.createTextNode('') as Text;
- // a.appendChild(textNode);
- // }
return element;
}
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_tabbar.sass b/frameworks/projects/Jewel/src/main/sass/components/_tabbar.sass
index a4e4631..45e27a4 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_tabbar.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_tabbar.sass
@@ -24,9 +24,9 @@
.jewel
&.tabbar
// width: 100%
- display: flex
- overflow-y: hidden
- overflow-x: scroll
+ //display: flex
+ // overflow-y: hidden
+ // overflow-x: scroll
-webkit-overflow-scrolling: touch //Momentum (innercial) Scrolling on iOS
-ms-overflow-style: -ms-autohiding-scrollbar !important // IE 10+
scrollbar-width: none // Firefox
@@ -38,19 +38,19 @@
&::-webkit-scrollbar-thumb
display: none !important
- > .content
- display: flex
+ // > .content
+ //display: flex
- position: relative
- flex: 1 0 auto
- transform: none
- will-change: transform
+ // position: relative
+ // flex: 1 0 auto
+ transform: none
+ will-change: transform
j|TabBar
IBeadView: ClassReference("org.apache.royale.jewel.beads.views.TabBarView")
IBeadController: ClassReference("org.apache.royale.jewel.beads.controllers.ListSingleSelectionMouseController")
- IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.NullLayout")
+ IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.HorizontalLayout")
IItemRendererClassFactory: ClassReference("org.apache.royale.core.SelectableItemRendererClassFactory")
IItemRenderer: ClassReference("org.apache.royale.jewel.itemRenderers.TabBarButtonItemRenderer")
IItemRendererInitializer: ClassReference("org.apache.royale.jewel.beads.itemRenderers.TabBarItemRendererInitializer")
@@ -75,7 +75,7 @@ $tabbarbutton-padding: 0 24px !default
position: relative
display: flex
- flex: 1 0 auto
+ flex: 1 0 auto !important
white-space: nowrap
justify-content: center
z-index: 1
@@ -111,6 +111,7 @@ $tabbarbutton-padding: 0 24px !default
j|TabBarButtonItemRenderer
IBeadController: ClassReference("org.apache.royale.html.beads.controllers.ItemRendererMouseController")
+ // IBeadLayout: ClassReference("org.apache.royale.jewel.beads.layouts.BasicLayout")
j|TabBarContent
diff --git a/frameworks/themes/JewelTheme/src/main/resources/defaults.css b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
index 1902b4e..5cd30fd 100644
--- a/frameworks/themes/JewelTheme/src/main/resources/defaults.css
+++ b/frameworks/themes/JewelTheme/src/main/resources/defaults.css
@@ -1173,8 +1173,8 @@ j|FormItem {
border-radius: 0px;
}
}
-.jewel.tabbar.sameWidths .content > * {
- flex: 1 0 0%;
+.jewel.tabbar.sameWidths > * {
+ flex: 1 0 0% !important;
}
.jewel.tabbarbutton {
@@ -1206,6 +1206,10 @@ j|FormItem {
background: rgba(60, 173, 241, 0.4);
}
+j|TabBar {
+ itemsExpand: true;
+}
+
.jewel.simpletable {
background: linear-gradient(white, #f3f3f3);
border: 1px solid #b3b3b3;
diff --git a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_tabbar.sass b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_tabbar.sass
index 2444eb3..bdcf0d0 100644
--- a/frameworks/themes/JewelTheme/src/main/sass/components-primary/_tabbar.sass
+++ b/frameworks/themes/JewelTheme/src/main/sass/components-primary/_tabbar.sass
@@ -25,9 +25,9 @@
.jewel
&.tabbar
&.sameWidths
- .content
- > *
- flex: 1 0 0%
+ // .content
+ > *
+ flex: 1 0 0% !important
// Jewel TabBarButtonItemRenderer
@@ -75,4 +75,7 @@
&.selected, &.selectable:active
// color: $font-theme-color
color: darken($primary-color, 15%)
- background: rgba($primary-color, .4)
\ No newline at end of file
+ background: rgba($primary-color, .4)
+
+j|TabBar
+ itemsExpand: true
\ No newline at end of file