← Back to branch summary

~dx-unity/unity/unity.fix_702431

« back to all changes in this revision

Viewing changes to src/Launcher.cpp

  • Committer: Didier Roche
  • Date: 2011-03-28 18:31:14 UTC
  • mfrom: (1025.1.1 unity)
  • Revision ID: didier.roche@canonical.com-20110328183114-n7g4f7ltovp6t212
Merge Andrea Azzarone change:
Fix "Launcher icon progress-bar too big for a 32px launcher" (#741775)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Launcher.cpp
3355
3355
  int width = texture->GetWidth ();
3356
3356
  int height = texture->GetHeight ();
3357
3357
  
3358
 
  int progress_width = _progress_bar_trough->GetWidth ();
 
3358
  int progress_width =  _icon_size;
3359
3359
  int progress_height = _progress_bar_trough->GetHeight ();
3360
3360
 
3361
 
  int fill_width = _progress_bar_fill->GetWidth ();
 
3361
  int fill_width = _icon_image_size - _icon_image_size_delta;
3362
3362
  int fill_height = _progress_bar_fill->GetHeight ();
3363
3363
  
3364
3364
  int fill_offset = (progress_width - fill_width) / 2;