Ubuntu UI Toolkit

Merge lp:~zsombi/ubuntu-ui-toolkit/scrollbar-visuals-update into lp:ubuntu-ui-toolkit

  1. scrollbar-visuals-update
  2. Merge into trunk
Proposed by Zsombor Egri
Status: Merged
Approved by: Zoltan Balogh
Approved revision: 311
Merged at revision: 311
Proposed branch: lp:~zsombi/ubuntu-ui-toolkit/scrollbar-visuals-update
Merge into: lp:ubuntu-ui-toolkit
Diff against target: 23 lines (+2/-0)
2 files modified
themes/Ambiance/qmltheme/ScrollbarDelegate.qml (+1/-0)
themes/Ambiance/qmltheme/default.qmltheme (+1/-0)
To merge this branch: bzr merge lp:~zsombi/ubuntu-ui-toolkit/scrollbar-visuals-update
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Pending
Zoltan Balogh Pending
Review via email: mp+146416@code.launchpad.net

Commit message

Scrollbar visuals update - radius for the slider is styled.

Description of the change

Scrollbar visuals update

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'themes/Ambiance/qmltheme/ScrollbarDelegate.qml'
2--- themes/Ambiance/qmltheme/ScrollbarDelegate.qml 2013-02-01 11:39:29 +0000
3+++ themes/Ambiance/qmltheme/ScrollbarDelegate.qml 2013-02-04 14:11:35 +0000
4@@ -236,6 +236,7 @@
5 y: (!isVertical) ? 0 : ScrollbarUtils.sliderPos(item, 0.0, item.height - slider.height)
6 width: (isVertical) ? scrollbarArea.thickness : ScrollbarUtils.sliderSize(item, minimumSliderSize, flickableItem.width)
7 height: (!isVertical) ? scrollbarArea.thickness : ScrollbarUtils.sliderSize(item, minimumSliderSize, flickableItem.height)
8+ radius: StyleUtils.itemStyleProperty("sliderRadius", units.gu(0.5))
9
10 Behavior on width {
11 enabled: (!isVertical)
12
13=== modified file 'themes/Ambiance/qmltheme/default.qmltheme'
14--- themes/Ambiance/qmltheme/default.qmltheme 2013-02-01 15:29:08 +0000
15+++ themes/Ambiance/qmltheme/default.qmltheme 2013-02-04 14:11:35 +0000
16@@ -224,6 +224,7 @@
17 forwardThumbReleased: (item.align === Qt.AlignLeading || item.align === Qt.AlignTrailing) ? url("artwork/ScrollbarBottomIdle.png") : url("artwork/ScrollbarRightIdle.png");
18 forwardThumbPressed: (item.align === Qt.AlignLeading || item.align === Qt.AlignTrailing) ? url("artwork/ScrollbarBottomPressed.png") : url("artwork/ScrollbarRightPressed.png");
19 scrollAreaThickness: units.gu(0.5);
20+ sliderRadius: units.gu(0.5);
21 thumbConnectorMargin: units.dp(3);
22 sliderColor: Qt.rgba(0.5, 0.5, 0.5, 0.7);
23 thumbConnectorColor: "white";

Subscribers

People subscribed via source and target branches

to status/vote changes: