diff options
| -rw-r--r-- | tdeio/tdefile/kurlbar.cpp | 8 | ||||
| -rw-r--r-- | tdeui/kiconview.cpp | 12 | ||||
| -rw-r--r-- | tdeui/ksystemtray.cpp | 2 |
3 files changed, 12 insertions, 10 deletions
diff --git a/tdeio/tdefile/kurlbar.cpp b/tdeio/tdefile/kurlbar.cpp index 2aa79353f..88b050db4 100644 --- a/tdeio/tdefile/kurlbar.cpp +++ b/tdeio/tdefile/kurlbar.cpp @@ -214,10 +214,12 @@ void KURLBarItem::paint( TQPainter *p ) p->drawPixmap( margin, yPos, *pm ); if ( !text().isEmpty() ) { TQFontMetrics fm = p->fontMetrics(); - if ( pm->height() < fm.height() ) + if ( pm->height() < fm.height() ) { yPos = fm.ascent() + fm.leading()/2; - else - yPos = pm->height()/2 - fm.height()/2 + fm.ascent(); + } + else { + yPos = height(box)/2 - fm.height()/2 + fm.ascent() - margin; + } yPos += margin; int stringWidth = box->width() - pm->width() - 2 - (margin * 2); diff --git a/tdeui/kiconview.cpp b/tdeui/kiconview.cpp index 8e9624db9..cd19f4030 100644 --- a/tdeui/kiconview.cpp +++ b/tdeui/kiconview.cpp @@ -540,18 +540,18 @@ void TDEIconViewItem::calcRect( const TQString& text_ ) tw = view->maxItemWidth() - ( view->itemTextPos() == TQIconView::Bottom ? 0 : itemIconRect.width() ); } - + TQFontMetrics *fm = view->itemFontMetrics(); TQString t; TQRect r; - + // When is text_ set ? Doesn't look like it's ever set. t = text_.isEmpty() ? text() : text_; - + // Max text height int nbLines = static_cast<TDEIconView*>( iconView() )->iconTextHeight(); int height = nbLines > 0 ? fm->height() * nbLines : 0xFFFFFFFF; - + // Should not be higher than pixmap if text is alongside icons if ( view->itemTextPos() != TQIconView::Bottom ) { if ( d && !d->m_pixmapSize.isNull() ) @@ -560,7 +560,7 @@ void TDEIconViewItem::calcRect( const TQString& text_ ) height = QMIN( itemIconRect.height(), height ); height = QMAX( height, fm->height() ); } - + // Calculate the word-wrap TQRect outerRect( 0, 0, tw - 6, height ); m_wordWrap = KWordWrap::formatText( *fm, outerRect, 0, t ); @@ -634,8 +634,8 @@ void TDEIconViewItem::calcRect( const TQString& text_ ) } if ( ( itemIconRect.height() <= 20 ) && ( itemTextRect.height() < itemIconRect.height() ) ) { d->realTextHeight = itemTextRect.height(); - itemTextRect.setHeight( itemIconRect.height() - 2 ); itemTextRect.setY( itemIconRect.y() ); + itemTextRect.setHeight( itemIconRect.height() - 2 ); } } diff --git a/tdeui/ksystemtray.cpp b/tdeui/ksystemtray.cpp index 5004d4bf1..fd58c6d06 100644 --- a/tdeui/ksystemtray.cpp +++ b/tdeui/ksystemtray.cpp @@ -85,7 +85,7 @@ KSystemTray::KSystemTray( TQWidget* parent, const char* name ) TQT_TQOBJECT(this), TQT_SLOT( minimizeRestoreAction() ), d->actionCollection, "minimizeRestore"); #ifdef Q_WS_X11 - KWin::WindowInfo info = KWin::windowInfo( parentWidget()->winId()); + KWin::WindowInfo info = KWin::windowInfo( parentWidget()->winId() ); d->on_all_desktops = info.onAllDesktops(); #else d->on_all_desktops = false; |