Merge lp://qastaging/~azzar1/unity/dash-layout-2 into lp://qastaging/unity
Proposed by
Andrea Azzarone
| Status: | Merged |
|---|---|
| Approved by: | Andrea Cimitan |
| Approved revision: | no longer in the source branch. |
| Merge reported by: | Didier Roche-Tolomelli |
| Merged at revision: | not available |
| Proposed branch: | lp://qastaging/~azzar1/unity/dash-layout-2 |
| Merge into: | lp://qastaging/unity |
| Diff against target: |
2037 lines (+519/-304) 26 files modified
plugins/unityshell/src/AbstractPlacesGroup.cpp (+3/-3) plugins/unityshell/src/DashStyle.cpp (+134/-15) plugins/unityshell/src/DashStyle.h (+41/-0) plugins/unityshell/src/DashView.cpp (+36/-27) plugins/unityshell/src/DashView.h (+1/-0) plugins/unityshell/src/FilterBar.cpp (+30/-30) plugins/unityshell/src/FilterBar.h (+1/-0) plugins/unityshell/src/FilterBasicButton.cpp (+2/-2) plugins/unityshell/src/FilterExpanderLabel.cpp (+42/-30) plugins/unityshell/src/FilterExpanderLabel.h (+6/-0) plugins/unityshell/src/FilterGenreWidget.cpp (+9/-5) plugins/unityshell/src/FilterMultiRangeButton.cpp (+2/-2) plugins/unityshell/src/FilterMultiRangeWidget.cpp (+9/-11) plugins/unityshell/src/FilterRatingsWidget.cpp (+5/-2) plugins/unityshell/src/HudView.cpp (+4/-0) plugins/unityshell/src/LensView.cpp (+25/-21) plugins/unityshell/src/LensView.h (+1/-0) plugins/unityshell/src/LineSeparator.cpp (+9/-12) plugins/unityshell/src/LineSeparator.h (+1/-0) plugins/unityshell/src/OverlayRenderer.cpp (+46/-44) plugins/unityshell/src/PlacesGroup.cpp (+44/-32) plugins/unityshell/src/PlacesGroup.h (+6/-1) plugins/unityshell/src/PlacesVScrollBar.cpp (+10/-3) plugins/unityshell/src/ResultViewGrid.cpp (+21/-9) plugins/unityshell/src/ResultViewGrid.h (+2/-0) plugins/unityshell/src/SearchBar.cpp (+29/-55) |
| To merge this branch: | bzr merge lp://qastaging/~azzar1/unity/dash-layout-2 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Andrea Cimitan (community) | design | Approve | |
| Tim Penhey (community) | Approve | ||
| John Lea | design | Pending | |
|
Review via email:
|
|||
Commit message
Fixing current dash layout which doesn't match the wanted design.
Moreover the dash code is full of magic number.
Description of the change
== Problem ==
The current dash layout doesn't match the wanted design. Moreover the dash code is full of magic numbers.
== Fix ==
Moves as many magic numbers as possible in dash::style.
== Test ==
Not applicable.
== Screenshots ==
Don't just rely on screenshots please.
http://
http://
http://
To post a comment you must log in.
Revision history for this message
| Marco Trevisan (Treviño) (3v1n0) wrote | # |
Revision history for this message
| Andrea Cimitan (cimi) wrote | # |
Revision history for this message
| Unity Merger (unity-merger) wrote | # |
Revision history for this message
| Unity Merger (unity-merger) wrote | # |
Revision history for this message
| Didier Roche-Tolomelli (didrocks) wrote | # |
Revision history for this message
| Andrea Azzarone (azzar1) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
This is a branch that would have been much easier to review in three different branches:
* removal of whitespace
* replacing constants with dash style
* fixing design bugs
Please think of the reviewers.
nux::Color color0 = color_;
color0.alpha = alpha0_;
is not the same as
nux::Color color0 = color_ * alpha0_;
The first has color0 same r,g,b values as color_ but a different alpha.
The second multiplies all the r,g,b and a values by the alpha.
Apart from that the code looks fine. However can you please add some before and after pictures and get a review from design?