diff options
| author | Florian Jung <flo@windfisch.org> | 2012-07-01 16:42:16 +0000 |
|---|---|---|
| committer | Florian Jung <flo@windfisch.org> | 2012-07-01 16:42:16 +0000 |
| commit | 9c4664d162c537ba4dd4fd8220971c0fb727103a (patch) | |
| tree | 37a28b7cd4e4d8984ad4934a4884cd7b4da0505c /muse2/muse/widgets/scldraw.cpp | |
| parent | e87fedf1be804f7ec774071d844b1f163be30b96 (diff) | |
final merge
Diffstat (limited to 'muse2/muse/widgets/scldraw.cpp')
| -rw-r--r-- | muse2/muse/widgets/scldraw.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/muse2/muse/widgets/scldraw.cpp b/muse2/muse/widgets/scldraw.cpp index 38adff25..aec769a0 100644 --- a/muse2/muse/widgets/scldraw.cpp +++ b/muse2/muse/widgets/scldraw.cpp @@ -636,7 +636,7 @@ int ScaleDraw::maxHeight(QPainter *p) const //------------------------------------------------------------ QRect ScaleDraw::maxBoundingRect(QPainter *p) const { - int i, wl,h,wmax; + int i, wl; //,wmax; int a, ar, amin, amax; double arc; @@ -645,7 +645,6 @@ QRect ScaleDraw::maxBoundingRect(QPainter *p) const QFontMetrics fm = p->fontMetrics(); wl = maxLabelWidth(p, TRUE); - h = fm.height(); switch(d_orient) { @@ -722,7 +721,7 @@ QRect ScaleDraw::maxBoundingRect(QPainter *p) const r.setBottom(MusECore::qwtInt(d_yCenter - (d_radius + double(d_majLen + d_vpad)) * cos(arc)) + fm.height() ); - wmax = d_len + d_majLen + d_hpad + wl; + //wmax = d_len + d_majLen + d_hpad + wl; DELETETHIS r.setLeft(d_xorg - d_majLen - d_hpad - wl); r.setWidth(d_len + 2*(d_majLen + d_hpad + wl)); |