Merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/fatFocus into lp:ubuntu-ui-toolkit/staging

Proposed by Christian Dywan on 2016-07-14
Status: Merged
Approved by: Tim Peeters on 2016-07-14
Approved revision: 2033
Merged at revision: 2033
Proposed branch: lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/fatFocus
Merge into: lp:ubuntu-ui-toolkit/staging
Diff against target: 25 lines (+2/-2)
2 files modified
src/Ubuntu/Components/Themes/Ambiance/1.3/FocusShape.qml (+1/-1)
src/Ubuntu/UbuntuToolkit/uclistitem.cpp (+1/-1)
To merge this branch: bzr merge lp:~ubuntu-sdk-team/ubuntu-ui-toolkit/fatFocus
Reviewer Review Type Date Requested Status
ubuntu-sdk-build-bot continuous-integration Approve on 2016-07-14
Tim Peeters 2016-07-14 Approve on 2016-07-14
Review via email: mp+300042@code.launchpad.net

Commit message

Increase focus ring thickness from 1dp to 2dp

To post a comment you must log in.
Tim Peeters (tpeeters) wrote :

Ok, happroving.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/FocusShape.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/FocusShape.qml 2016-04-27 07:31:49 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/FocusShape.qml 2016-07-14 08:07:46 +0000
@@ -26,7 +26,7 @@
26 color: styledItem.enabled26 color: styledItem.enabled
27 ? theme.palette.normal.focus27 ? theme.palette.normal.focus
28 : theme.palette.disabled.focus28 : theme.palette.disabled.focus
29 thickness: units.dp(1)29 thickness: units.dp(2)
30 radius: units.gu(1.7)30 radius: units.gu(1.7)
31 visible: styledItem.keyNavigationFocus31 visible: styledItem.keyNavigationFocus
3232
3333
=== modified file 'src/Ubuntu/UbuntuToolkit/uclistitem.cpp'
--- src/Ubuntu/UbuntuToolkit/uclistitem.cpp 2016-07-07 08:42:42 +0000
+++ src/Ubuntu/UbuntuToolkit/uclistitem.cpp 2016-07-14 08:07:46 +0000
@@ -1127,7 +1127,7 @@
11271127
1128 // focus frame1128 // focus frame
1129 bool paintFocus = hasActiveFocus() && keyNavigationFocus();1129 bool paintFocus = hasActiveFocus() && keyNavigationFocus();
1130 rectNode->setPenWidth(paintFocus ? UCUnits::instance()->dp(1) : 0);1130 rectNode->setPenWidth(paintFocus ? UCUnits::instance()->dp(2) : 0);
1131 if (paintFocus) {1131 if (paintFocus) {
1132 QColor penColor;1132 QColor penColor;
1133 if (getTheme()) {1133 if (getTheme()) {

Subscribers

People subscribed via source and target branches