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
=== modified file 'src/app/ChromeButton.qml'
--- src/app/ChromeButton.qml 2014-07-29 21:51:07 +0000
+++ src/app/ChromeButton.qml 2015-04-30 22:45:11 +0000
@@ -23,6 +23,12 @@
23 property real iconSize: width23 property real iconSize: width
24 property alias iconName: icon.name24 property alias iconName: icon.name
2525
26 Rectangle {
27 anchors.fill: parent
28 color: Theme.palette.selected.background
29 visible: parent.pressed
30 }
31
26 Icon {32 Icon {
27 id: icon33 id: icon
28 anchors.centerIn: parent34 anchors.centerIn: parent
2935
=== modified file 'src/app/webbrowser/Chrome.qml'
--- src/app/webbrowser/Chrome.qml 2015-03-23 07:49:08 +0000
+++ src/app/webbrowser/Chrome.qml 2015-04-30 22:45:11 +0000
@@ -43,10 +43,10 @@
43 objectName: "backButton"43 objectName: "backButton"
4444
45 iconName: "previous"45 iconName: "previous"
46 iconSize: 0.6 * height46 iconSize: 0.4 * height
4747
48 height: parent.height48 height: chrome.height
49 width: height49 width: height * 0.8
5050
51 anchors {51 anchors {
52 left: parent.left52 left: parent.left
@@ -62,11 +62,11 @@
62 objectName: "forwardButton"62 objectName: "forwardButton"
6363
64 iconName: "next"64 iconName: "next"
65 iconSize: 0.6 * height65 iconSize: 0.4 * height
6666
67 height: parent.height67 height: chrome.height
68 visible: enabled68 visible: enabled
69 width: visible ? height : 069 width: visible ? height * 0.8 : 0
7070
71 anchors {71 anchors {
72 left: backButton.right72 left: backButton.right
@@ -127,10 +127,10 @@
127 objectName: "drawerButton"127 objectName: "drawerButton"
128128
129 iconName: "contextual-menu"129 iconName: "contextual-menu"
130 iconSize: 0.75 * height130 iconSize: 0.5 * height
131131
132 height: parent.height132 height: chrome.height
133 width: height133 width: height * 0.8
134134
135 anchors {135 anchors {
136 right: parent.right136 right: parent.right
@@ -244,6 +244,12 @@
244 action: modelData244 action: modelData
245 onClicked: drawer.opened = false245 onClicked: drawer.opened = false
246246
247 Rectangle {
248 anchors.fill: parent
249 color: Theme.palette.selected.background
250 visible: parent.pressed
251 }
252
247 Icon {253 Icon {
248 id: actionIcon254 id: actionIcon
249 anchors {255 anchors {

Subscribers

People subscribed via source and target branches

to status/vote changes: