← Back to branch summary

~unity-team/unity/trunk

« back to all changes in this revision

Viewing changes to dash/previews/ActionButton.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/previews/ActionButton.cpp
29
29
 
30
30
namespace
31
31
{
32
 
const int kMinButtonHeight = 36;
 
32
const int kMinButtonHeight = 34;
33
33
const int kMinButtonWidth  = 48;
34
34
 
35
35
const int icon_size  = 24;