Ubuntu UI Toolkit

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

  1. fatFocus
  2. Merge into 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.
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Needs Fixing (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :

FAILED: Continuous integration, rev:2033
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/537/
Executed test runs:
    FAILURE: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1033/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1057
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/838
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/812
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4397/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4391
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4394
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4395
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/4396

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/537/rebuild

review: Needs Fixing (continuous-integration)
Tim Peeters (tpeeters) wrote :

Ok, happroving.

review: Approve
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)
ubuntu-sdk-build-bot (ubuntu-sdk-build-bot) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/FocusShape.qml'
2--- src/Ubuntu/Components/Themes/Ambiance/1.3/FocusShape.qml 2016-04-27 07:31:49 +0000
3+++ src/Ubuntu/Components/Themes/Ambiance/1.3/FocusShape.qml 2016-07-14 08:07:46 +0000
4@@ -26,7 +26,7 @@
5 color: styledItem.enabled
6 ? theme.palette.normal.focus
7 : theme.palette.disabled.focus
8- thickness: units.dp(1)
9+ thickness: units.dp(2)
10 radius: units.gu(1.7)
11 visible: styledItem.keyNavigationFocus
12
13
14=== modified file 'src/Ubuntu/UbuntuToolkit/uclistitem.cpp'
15--- src/Ubuntu/UbuntuToolkit/uclistitem.cpp 2016-07-07 08:42:42 +0000
16+++ src/Ubuntu/UbuntuToolkit/uclistitem.cpp 2016-07-14 08:07:46 +0000
17@@ -1127,7 +1127,7 @@
18
19 // focus frame
20 bool paintFocus = hasActiveFocus() && keyNavigationFocus();
21- rectNode->setPenWidth(paintFocus ? UCUnits::instance()->dp(1) : 0);
22+ rectNode->setPenWidth(paintFocus ? UCUnits::instance()->dp(2) : 0);
23 if (paintFocus) {
24 QColor penColor;
25 if (getTheme()) {

Subscribers

People subscribed via source and target branches