Repository: flex-asjs Updated Branches: refs/heads/develop a5649a568 -> 9c5d176a3
fix up flat scrollbar Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/16cbd77c Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/16cbd77c Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/16cbd77c Branch: refs/heads/develop Commit: 16cbd77cdb8272abcc4f623477e75630ad36e436 Parents: 90e7fc1 Author: Alex Harui <[email protected]> Authored: Thu Jul 30 09:27:51 2015 -0700 Committer: Alex Harui <[email protected]> Committed: Thu Jul 30 10:54:53 2015 -0700 ---------------------------------------------------------------------- frameworks/projects/Flat/as/defaults.css | 2 +- frameworks/projects/Flat/flat-manifest.xml | 2 +- .../org/apache/flex/html/beads/layouts/VScrollBarLayout.as | 7 ++++++- 3 files changed, 8 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/16cbd77c/frameworks/projects/Flat/as/defaults.css ---------------------------------------------------------------------- diff --git a/frameworks/projects/Flat/as/defaults.css b/frameworks/projects/Flat/as/defaults.css index dbbdcf4..a54c912 100644 --- a/frameworks/projects/Flat/as/defaults.css +++ b/frameworks/projects/Flat/as/defaults.css @@ -734,7 +734,7 @@ RadioButton background-color: #16a085; } -ScrollBar +VScrollBar { IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.VScrollBarLayout"); IBeadModel: ClassReference("org.apache.flex.html.beads.models.ScrollBarModel"); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/16cbd77c/frameworks/projects/Flat/flat-manifest.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Flat/flat-manifest.xml b/frameworks/projects/Flat/flat-manifest.xml index dcd2aca..253aaf6 100644 --- a/frameworks/projects/Flat/flat-manifest.xml +++ b/frameworks/projects/Flat/flat-manifest.xml @@ -69,7 +69,7 @@ <component id="DropDownListStringItemRenderer" class="org.apache.flex.flat.supportClasses.DropDownListStringItemRenderer" /> <component id="DataItemRenderer" class="org.apache.flex.html.supportClasses.DataItemRenderer" lookupOnly="true" /> <component id="ButtonBarButtonItemRenderer" class="org.apache.flex.html.supportClasses.ButtonBarButtonItemRenderer" lookupOnly="true" /> - <component id="ScrollBar" class="org.apache.flex.html.supportClasses.ScrollBar" lookupOnly="true" /> + <component id="VScrollBar" class="org.apache.flex.html.supportClasses.VScrollBar" lookupOnly="true" /> <component id="CSSScrollBarView" class="org.apache.flex.flat.beads.CSSScrollBarView" /> <component id="NumericOnlyTextInputBead" class="org.apache.flex.html.accessories.NumericOnlyTextInputBead" lookupOnly="true" /> <component id="PasswordInputBead" class="org.apache.flex.html.accessories.PasswordInputBead" lookupOnly="true" /> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/16cbd77c/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/VScrollBarLayout.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/VScrollBarLayout.as b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/VScrollBarLayout.as index dddbff3..00c53b3 100644 --- a/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/VScrollBarLayout.as +++ b/frameworks/projects/HTML/as/src/org/apache/flex/html/beads/layouts/VScrollBarLayout.as @@ -96,7 +96,12 @@ package org.apache.flex.html.beads.layouts increment.x = 0; increment.y = h - increment.height - 1; - track.x = 0; + if (track.width < thumb.width) + track.x = (thumb.width - track.width) / 2; + else if (track.width > thumb.width) + thumb.x = (track.width - thumb.width) / 2; + else + track.x = 0; track.y = decrement.height; track.height = increment.y - decrement.height; thumb.height = sbModel.pageSize / (sbModel.maximum - sbModel.minimum) * track.height;
