Merge lp:~fboucault/ubuntu-ui-toolkit/checkbox_clipping_fix into lp:ubuntu-ui-toolkit/staging

Proposed by Florian Boucault
Status: Merged
Approved by: Zsombor Egri
Approved revision: 1436
Merged at revision: 1437
Proposed branch: lp:~fboucault/ubuntu-ui-toolkit/checkbox_clipping_fix
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 39 lines (+4/-4)
1 file modified
modules/Ubuntu/Components/Themes/Ambiance/CheckBoxStyle.qml (+4/-4)
To merge this branch: bzr merge lp:~fboucault/ubuntu-ui-toolkit/checkbox_clipping_fix
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Zsombor Egri Approve
Review via email: mp+252008@code.launchpad.net

Commit message

CheckBox: apply clipping to the Ubuntu shape and not to the CheckBox itself so that the tick never overflows.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Zsombor Egri (zsombi) wrote :

Nice fix, thanks!

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'modules/Ubuntu/Components/Themes/Ambiance/CheckBoxStyle.qml'
2--- modules/Ubuntu/Components/Themes/Ambiance/CheckBoxStyle.qml 2015-03-03 13:47:48 +0000
3+++ modules/Ubuntu/Components/Themes/Ambiance/CheckBoxStyle.qml 2015-03-05 19:36:29 +0000
4@@ -113,7 +113,7 @@
5 }
6 SequentialAnimation {
7 PropertyAction {
8- target: checkBoxStyle
9+ target: background
10 property: "clip"
11 value: true
12 }
13@@ -124,7 +124,7 @@
14 easing: UbuntuAnimation.StandardEasingReverse
15 }
16 PropertyAction {
17- target: checkBoxStyle
18+ target: background
19 property: "clip"
20 value: false
21 }
22@@ -140,7 +140,7 @@
23 }
24 SequentialAnimation {
25 PropertyAction {
26- target: checkBoxStyle
27+ target: background
28 property: "clip"
29 value: true
30 }
31@@ -151,7 +151,7 @@
32 easing: UbuntuAnimation.StandardEasing
33 }
34 PropertyAction {
35- target: checkBoxStyle
36+ target: background
37 property: "clip"
38 value: false
39 }

Subscribers

People subscribed via source and target branches