unity-2d

Merge lp:~agateau/unity-2d/desktop-dash-bg into lp:unity-2d/3.0

  1. desktop-dash-bg
  2. Merge into natty
Proposed by Aurélien Gâteau
Status: Merged
Approved by: Florian Boucault
Approved revision: 411
Merged at revision: 415
Proposed branch: lp:~agateau/unity-2d/desktop-dash-bg
Merge into: lp:unity-2d/3.0
Diff against target: 124 lines (+36/-23)
3 files modified
places/app/dashdeclarativeview.cpp (+1/-1)
places/app/dashdeclarativeview.h (+2/-1)
places/dash.qml (+33/-21)
To merge this branch: bzr merge lp:~agateau/unity-2d/desktop-dash-bg
Reviewer Review Type Date Requested Status
Florian Boucault (community) code Needs Fixing
Review via email: mp+51106@code.launchpad.net

Commit message

[dash] Fix dash background:
- Do not overlap desktop dash borders
- Use a black semi transparent background in fullscreen + composite mode

Description of the change

[dash] Fix dash background:
- Do not overlap desktop dash borders
- Use a black semi transparent background in fullscreen + composite mode

To post a comment you must log in.
Revision history for this message
Florian Boucault (fboucault) wrote :

In collapsed mode the content still overlaps the search bar.

review: Needs Fixing (functional)
Revision history for this message
Florian Boucault (fboucault) wrote :

> In collapsed mode the content still overlaps the search bar.

And by search bar, I meant the border:

In collapsed mode the content still overlaps the border*

Revision history for this message
Florian Boucault (fboucault) wrote :

Adding a isCompositingManagerRunningChanged signal not only is unrelated to that MR but also is only meant as far as I understand it to shut up QML warnings but the signal is never fired. It does not make sense to let the users of the API think that there is a change notification emitted when there is none.

review: Needs Fixing (code)
Revision history for this message
Florian Boucault (fboucault) wrote :

I am tired of repeating the same things:

"""
About "Content/search results should not overlap the border.", I believe the correct values are:

        anchors.rightMargin: 37
        anchors.bottomMargin: 39

That is for the item containing all the content (= item containing search_entry, pageLoader, etc.)

Also I guess the fullScreenButton will have to be moved out of it.
"""

review: Needs Fixing (code)
Revision history for this message
Aurélien Gâteau (agateau) wrote :

On Thursday 24 February 2011 13:19:11 you wrote:
> Review: Needs Fixing code
> I am tired of repeating the same things:

Done.

lp:~agateau/unity-2d/desktop-dash-bg updated
411. By Aurélien Gâteau

Rework the way the border bug is fixed

Revision history for this message
Aurélien Gâteau (agateau) wrote :

On Thursday 24 February 2011 13:04:56 you wrote:
> Review: Needs Fixing code
> Adding a isCompositingManagerRunningChanged signal not only is unrelated to
> that MR but also is only meant as far as I understand it to shut up QML
> warnings but the signal is never fired. It does not make sense to let the
> users of the API think that there is a change notification emitted when
> there is none.

It is related in that the property was added in the previous desktop-dash MR.

Reducing noise on stderr is important to be able to notice real problems.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'places/app/dashdeclarativeview.cpp'
--- places/app/dashdeclarativeview.cpp 2011-02-24 01:13:42 +0000
+++ places/app/dashdeclarativeview.cpp 2011-02-24 15:38:56 +0000
@@ -34,7 +34,7 @@
34static const int DASH_MIN_SCREEN_HEIGHT = 1084;34static const int DASH_MIN_SCREEN_HEIGHT = 1084;
3535
36static const int DASH_DESKTOP_WIDTH = 989;36static const int DASH_DESKTOP_WIDTH = 989;
37static const int DASH_DESKTOP_COLLAPSED_HEIGHT = 78;37static const int DASH_DESKTOP_COLLAPSED_HEIGHT = 115;
38static const int DASH_DESKTOP_EXPANDED_HEIGHT = 606;38static const int DASH_DESKTOP_EXPANDED_HEIGHT = 606;
3939
40DashDeclarativeView::DashDeclarativeView()40DashDeclarativeView::DashDeclarativeView()
4141
=== modified file 'places/app/dashdeclarativeview.h'
--- places/app/dashdeclarativeview.h 2011-02-24 01:13:42 +0000
+++ places/app/dashdeclarativeview.h 2011-02-24 15:38:56 +0000
@@ -31,7 +31,7 @@
31 Q_PROPERTY(QString activePlaceEntry READ activePlaceEntry WRITE setActivePlaceEntry NOTIFY activePlaceEntryChanged)31 Q_PROPERTY(QString activePlaceEntry READ activePlaceEntry WRITE setActivePlaceEntry NOTIFY activePlaceEntryChanged)
32 Q_PROPERTY(QRect screenGeometry READ screenGeometry NOTIFY screenGeometryChanged)32 Q_PROPERTY(QRect screenGeometry READ screenGeometry NOTIFY screenGeometryChanged)
33 Q_PROPERTY(QRect availableGeometry READ availableGeometry NOTIFY availableGeometryChanged)33 Q_PROPERTY(QRect availableGeometry READ availableGeometry NOTIFY availableGeometryChanged)
34 Q_PROPERTY(bool isCompositingManagerRunning READ isCompositingManagerRunning)34 Q_PROPERTY(bool isCompositingManagerRunning READ isCompositingManagerRunning NOTIFY isCompositingManagerRunningChanged)
3535
36public:36public:
37 enum DashMode {37 enum DashMode {
@@ -68,6 +68,7 @@
6868
69 void screenGeometryChanged();69 void screenGeometryChanged();
70 void availableGeometryChanged();70 void availableGeometryChanged();
71 void isCompositingManagerRunningChanged(bool);
7172
72protected:73protected:
73 void resizeEvent(QResizeEvent*);74 void resizeEvent(QResizeEvent*);
7475
=== modified file 'places/dash.qml'
--- places/dash.qml 2011-02-21 17:45:59 +0000
+++ places/dash.qml 2011-02-24 15:38:56 +0000
@@ -65,11 +65,19 @@
65 Component.onCompleted: startAllPlaceServices()65 Component.onCompleted: startAllPlaceServices()
66 }66 }
6767
68 /* Backgrounds */
68 GnomeBackground {69 GnomeBackground {
69 anchors.fill: parent70 anchors.fill: parent
70 overlay_color: "black"71 overlay_color: "black"
71 overlay_alpha: 0.7172 overlay_alpha: 0.71
72 visible: dashView.dashMode == DashDeclarativeView.FullScreenMode73 visible: dashView.dashMode == DashDeclarativeView.FullScreenMode && !dashView.isCompositingManagerRunning
74 }
75
76 Rectangle {
77 anchors.fill: parent
78 color: "black"
79 opacity: 0.69
80 visible: dashView.dashMode == DashDeclarativeView.FullScreenMode && dashView.isCompositingManagerRunning
73 }81 }
7482
75 BorderImage {83 BorderImage {
@@ -77,9 +85,13 @@
77 visible: dashView.dashMode == DashDeclarativeView.DesktopMode85 visible: dashView.dashMode == DashDeclarativeView.DesktopMode
78 source: dashView.isCompositingManagerRunning ? "artwork/desktop_dash_background.sci" : "artwork/desktop_dash_background_no_transparency.sci"86 source: dashView.isCompositingManagerRunning ? "artwork/desktop_dash_background.sci" : "artwork/desktop_dash_background_no_transparency.sci"
79 }87 }
88 /* /Backgrounds */
8089
81 Item {90 Item {
82 anchors.fill: parent91 anchors.fill: parent
92 anchors.bottomMargin: dashView.dashMode == DashDeclarativeView.DesktopMode ? 38 : 0
93 anchors.rightMargin: dashView.dashMode == DashDeclarativeView.DesktopMode ? 40 : 0
94
83 visible: dashView.active95 visible: dashView.active
8496
85 /* Unhandled keys will always be forwarded to the search bar. That way97 /* Unhandled keys will always be forwarded to the search bar. That way
@@ -119,26 +131,6 @@
119 anchors.rightMargin: 19131 anchors.rightMargin: 19
120 }132 }
121133
122 Button {
123 id: fullScreenButton
124 anchors.bottom: parent.bottom
125 anchors.right: parent.right
126 anchors.rightMargin: 15
127 anchors.bottomMargin: 15
128 width: fullScreenButtonImage.sourceSize.width
129 height: fullScreenButtonImage.sourceSize.height
130 visible: dashView.dashMode != DashDeclarativeView.FullScreenMode
131
132 Image {
133 id: fullScreenButtonImage
134 source: "artwork/fullscreen_button.png"
135 }
136
137 onClicked: {
138 dashView.dashMode = DashDeclarativeView.FullScreenMode
139 }
140 }
141
142 Loader {134 Loader {
143 id: pageLoader135 id: pageLoader
144136
@@ -152,4 +144,24 @@
152 anchors.rightMargin: refine_search.folded ? 0 : 15144 anchors.rightMargin: refine_search.folded ? 0 : 15
153 }145 }
154 }146 }
147
148 Button {
149 id: fullScreenButton
150 anchors.bottom: parent.bottom
151 anchors.right: parent.right
152 anchors.rightMargin: 15
153 anchors.bottomMargin: 15
154 width: fullScreenButtonImage.sourceSize.width
155 height: fullScreenButtonImage.sourceSize.height
156 visible: dashView.dashMode != DashDeclarativeView.FullScreenMode
157
158 Image {
159 id: fullScreenButtonImage
160 source: "artwork/fullscreen_button.png"
161 }
162
163 onClicked: {
164 dashView.dashMode = DashDeclarativeView.FullScreenMode
165 }
166 }
155}167}

Subscribers

People subscribed via source and target branches