← Back to branch summary

~unity-team/unity/trunk

« back to all changes in this revision

Viewing changes to dash/LensBar.cpp

  • Committer: Daniel van Vugt
  • Date: 2012-09-13 10:56:42 UTC
  • mfrom: (2684 unity)
  • mto: This revision was merged to the branch mainline in revision 2698.
  • Revision ID: daniel.van.vugt@canonical.com-20120913105642-9on2ald55h54j1zn
Merge latest lp:unity and fix conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
dash/LensBar.cpp
31
31
 
32
32
nux::logging::Logger logger("unity.dash.lensbar");
33
33
 
34
 
const int LENSBAR_HEIGHT = 44;
 
34
// according to Q design the inner area of the lensbar should be 40px
 
35
// (without any borders)
 
36
const int LENSBAR_HEIGHT = 41;
35
37
 
36
38
}
37
39