Changeset View
Changeset View
Standalone View
Standalone View
src/kcapacitybar.cpp
Show First 20 Lines • Show All 344 Lines • ▼ Show 20 Line(s) | 342 | if (d->drawTextMode == KCapacityBar::DrawTextInline) { | |||
---|---|---|---|---|---|
345 | p->drawText(rect, Qt::AlignCenter, fontMetrics().elidedText(d->text, Qt::ElideRight, drawRect.width() - 2 * ROUND_MARGIN)); | 345 | p->drawText(rect, Qt::AlignCenter, fontMetrics().elidedText(d->text, Qt::ElideRight, drawRect.width() - 2 * ROUND_MARGIN)); | ||
346 | } else { | 346 | } else { | ||
347 | p->drawText(rect, Qt::AlignBottom | d->horizontalTextAlignment, fontMetrics().elidedText(d->text, Qt::ElideRight, drawRect.width())); | 347 | p->drawText(rect, Qt::AlignBottom | d->horizontalTextAlignment, fontMetrics().elidedText(d->text, Qt::ElideRight, drawRect.width())); | ||
348 | } | 348 | } | ||
349 | } | 349 | } | ||
350 | 350 | | |||
351 | QSize KCapacityBar::minimumSizeHint() const | 351 | QSize KCapacityBar::minimumSizeHint() const | ||
352 | { | 352 | { | ||
353 | int width = (d->drawTextMode == KCapacityBar::DrawTextInline) ? | 353 | int width = fontMetrics().boundingRect(d->text).width() + ((d->drawTextMode == KCapacityBar::DrawTextInline) ? ROUND_MARGIN * 2 : 0); | ||
354 | fontMetrics().width(d->text) + ROUND_MARGIN * 2 : | | |||
355 | fontMetrics().width(d->text); | | |||
356 | 354 | | |||
357 | int height = (d->drawTextMode == KCapacityBar::DrawTextInline) ? | 355 | int height = (d->drawTextMode == KCapacityBar::DrawTextInline) ? | ||
358 | qMax(fontMetrics().height(), d->barHeight) : | 356 | qMax(fontMetrics().height(), d->barHeight) : | ||
359 | (d->text.isEmpty() ? 0 : fontMetrics().height() + VERTICAL_SPACING * 2) + d->barHeight; | 357 | (d->text.isEmpty() ? 0 : fontMetrics().height() + VERTICAL_SPACING * 2) + d->barHeight; | ||
360 | 358 | | |||
361 | if (height % 2) { | 359 | if (height % 2) { | ||
362 | height++; | 360 | height++; | ||
363 | } | 361 | } | ||
Show All 19 Lines |