Merge lp:~osomon/webbrowser-app/chrome-buttons-pressed-state into lp:webbrowser-app

Proposed by Olivier Tilloy
Status: Merged
Approved by: Olivier Tilloy
Approved revision: 989
Merged at revision: 997
Proposed branch: lp:~osomon/webbrowser-app/chrome-buttons-pressed-state
Merge into: lp:webbrowser-app
Diff against target: 76 lines (+21/-9)
2 files modified
src/app/ChromeButton.qml (+6/-0)
src/app/webbrowser/Chrome.qml (+15/-9)
To merge this branch: bzr merge lp:~osomon/webbrowser-app/chrome-buttons-pressed-state
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Ubuntu Phablet Team Pending
Review via email: mp+257979@code.launchpad.net

Commit message

Visual feedback for pressed state of chrome buttons and drawer menu entries.

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/app/ChromeButton.qml'
2--- src/app/ChromeButton.qml 2014-07-29 21:51:07 +0000
3+++ src/app/ChromeButton.qml 2015-04-30 22:45:11 +0000
4@@ -23,6 +23,12 @@
5 property real iconSize: width
6 property alias iconName: icon.name
7
8+ Rectangle {
9+ anchors.fill: parent
10+ color: Theme.palette.selected.background
11+ visible: parent.pressed
12+ }
13+
14 Icon {
15 id: icon
16 anchors.centerIn: parent
17
18=== modified file 'src/app/webbrowser/Chrome.qml'
19--- src/app/webbrowser/Chrome.qml 2015-03-23 07:49:08 +0000
20+++ src/app/webbrowser/Chrome.qml 2015-04-30 22:45:11 +0000
21@@ -43,10 +43,10 @@
22 objectName: "backButton"
23
24 iconName: "previous"
25- iconSize: 0.6 * height
26+ iconSize: 0.4 * height
27
28- height: parent.height
29- width: height
30+ height: chrome.height
31+ width: height * 0.8
32
33 anchors {
34 left: parent.left
35@@ -62,11 +62,11 @@
36 objectName: "forwardButton"
37
38 iconName: "next"
39- iconSize: 0.6 * height
40+ iconSize: 0.4 * height
41
42- height: parent.height
43+ height: chrome.height
44 visible: enabled
45- width: visible ? height : 0
46+ width: visible ? height * 0.8 : 0
47
48 anchors {
49 left: backButton.right
50@@ -127,10 +127,10 @@
51 objectName: "drawerButton"
52
53 iconName: "contextual-menu"
54- iconSize: 0.75 * height
55+ iconSize: 0.5 * height
56
57- height: parent.height
58- width: height
59+ height: chrome.height
60+ width: height * 0.8
61
62 anchors {
63 right: parent.right
64@@ -244,6 +244,12 @@
65 action: modelData
66 onClicked: drawer.opened = false
67
68+ Rectangle {
69+ anchors.fill: parent
70+ color: Theme.palette.selected.background
71+ visible: parent.pressed
72+ }
73+
74 Icon {
75 id: actionIcon
76 anchors {

Subscribers

People subscribed via source and target branches

to status/vote changes: