← Back to branch summary

~nick-dedekind/unity/lp1673950.tooltip.scaling

« back to all changes in this revision

Viewing changes to launcher/Tooltip.cpp

  • Committer: Nick Dedekind
  • Date: 2017-04-18 16:28:13 UTC
  • Revision ID: nick.dedekind@canonical.com-20170418162813-v83s1u4hbqs1xhts
_left_size already has dpi scaling included

Show diffs side-by-side

added added

removed removed

Lines of Context:
launcher/Tooltip.cpp
124
124
  {
125
125
    int size = 0;
126
126
    int max = GetBaseWidth() - ROTATED_ANCHOR_WIDTH.CP(cv_) - 2 * CORNER_RADIUS.CP(cv_) - 2 * _padding.CP(cv_);
127
 
    if (_left_size.CP(cv_) > max)
 
127
    if (_left_size > max)
128
128
    {
129
129
      size = max;
130
130
    }
131
 
    else if (_left_size.CP(cv_) > 0)
 
131
    else if (_left_size > 0)
132
132
    {
133
 
      size = _left_size.CP(cv_);
 
133
      size = _left_size;
134
134
    }
135
135
    x = _anchorX - (ROTATED_ANCHOR_WIDTH.CP(cv_) / 2) - size - CORNER_RADIUS.CP(cv_) - _padding.CP(cv_);
136
136
  }
653
653
    height / dpi_scale,
654
654
    anchor_width,
655
655
    anchor_height,
656
 
    _left_size,
 
656
    _left_size / dpi_scale,
657
657
    CORNER_RADIUS,
658
658
    blur_coef,
659
659
    shadow_color,
669
669
    CORNER_RADIUS,         // radius,
670
670
    anchor_width,          // anchor_width,
671
671
    anchor_height,         // anchor_height,
672
 
    _left_size,            // left_size,
 
672
    _left_size / dpi_scale,    // left_size,
673
673
    true,                  // negative,
674
674
    false,                 // outline,
675
675
    1.0,                   // line_width,