← Back to branch summary

~unity-team/unity/trusty-1332509

« back to all changes in this revision

Viewing changes to hud/HudIcon.cpp

  • Committer: CI bot
  • Author(s): Stephen M. Webb, Marco Trevisan (Treviño), Andrea Azzarone, Pawel Szubert, Chris Townsend, Andrea Azzarone, Eleni Maria Stea
  • Date: 2014-08-26 13:48:28 UTC
  • mfrom: (3800.1.24 prepare-7.2.3-SRU)
  • Revision ID: ps-jenkins@lists.canonical.com-20140826134828-fkev1oisyfl9kbt3
Prepare fixes for upstream micro-release 7.2.3. Fixes: 1283415, 1292391, 1306211, 1312107, 1320051, 1320071, 1324114, 1339629, 1340171, 1340394, 1340477, 1340992, 1340996, 1342208, 1342731, 1347735

Show diffs side-by-side

added added

removed removed

Lines of Context:
hud/HudIcon.cpp
45
45
  IconTexture::SetByIconName(icon_name, icon_size);
46
46
  icon_renderer_.SetTargetSize(tile_size, icon_size, 0);
47
47
 
48
 
  SetMinimumHeight(tile_size + padding);
49
 
  SetMinimumWidth(tile_size + padding);
 
48
  SetMinMaxSize(tile_size + padding, tile_size + padding);
50
49
}
51
50
 
52
51
void Icon::Draw(nux::GraphicsEngine& GfxContext, bool force_draw)