X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/b91b63bc42ee9a947a3dde99a259deb7ad8c8e97..d15ff3305909c8a6f77da2d574a1ec98d97c7552:/src/tooltipmanager.cpp diff --git a/src/tooltipmanager.cpp b/src/tooltipmanager.cpp index eb1e52ec1..aefa846e9 100644 --- a/src/tooltipmanager.cpp +++ b/src/tooltipmanager.cpp @@ -33,8 +33,6 @@ #include #include -const int PREVIEW_WIDTH = 256; -const int PREVIEW_HEIGHT = 256; const int ICON_WIDTH = 128; const int ICON_HEIGHT = 128; const int PREVIEW_DELAY = 250; @@ -163,7 +161,7 @@ void ToolTipManager::prepareToolTip() m_emptyRenderedKToolTipItem = toolTip; // make toolTip accessible everywhere showToolTip(toolTip); } - + ++m_previewPass; m_waitOnPreviewTimer->start(250); } else { @@ -201,7 +199,7 @@ void ToolTipManager::showToolTip(KToolTipItem* tip) m_emptyRenderedKToolTipItem = 0; return; } - + KStyleOptionToolTip option; // TODO: get option content from KToolTip or add KToolTip::sizeHint() method option.direction = QApplication::layoutDirection(); @@ -234,14 +232,14 @@ void ToolTipManager::showToolTip(KToolTipItem* tip) const bool hasRoomToLeft = (m_itemRect.left() - size.width() >= desktop.left()); const bool hasRoomToRight = (m_itemRect.right() + size.width() <= desktop.right()); const bool hasRoomAbove = (m_itemRect.top() - size.height() >= desktop.top()); - const bool hasRoomBelow = (m_itemRect.bottom() + size.height() <= desktop.bottom()); + const bool hasRoomBelow = (m_itemRect.bottom() + size.height() <= desktop.bottom()); if (!hasRoomAbove && !hasRoomBelow && !hasRoomToLeft && !hasRoomToRight) { delete tip; tip = 0; return; } - int x = 0; + int x = 0; int y = 0; if (hasRoomBelow || hasRoomAbove) { x = QCursor::pos().x() + 16; // TODO: use mouse pointer width instead of the magic value of 16 @@ -252,7 +250,7 @@ void ToolTipManager::showToolTip(KToolTipItem* tip) } else { Q_ASSERT(hasRoomToLeft || hasRoomToRight); x = hasRoomToRight ? m_itemRect.right() : m_itemRect.left() - size.width(); - + // Put the tooltip at the bottom of the screen. The x-coordinate has already // been adjusted, so that no overlapping with m_itemRect occurs. y = desktop.bottom() - size.height(); @@ -266,7 +264,7 @@ void ToolTipManager::showToolTip(KToolTipItem* tip) void ToolTipManager::startPreviewJob() { m_generatingPreview = true; - KIO::PreviewJob* job = KIO::filePreview(KUrl::List() << m_item.url(), + KIO::PreviewJob* job = KIO::filePreview(KFileItemList() << m_item, PREVIEW_WIDTH, PREVIEW_HEIGHT); job->setIgnoreMaximumSize(true); @@ -285,7 +283,7 @@ void ToolTipManager::setPreviewPix(const KFileItem& item, m_generatingPreview = false; return; } - + if (m_previewIsLate) { // always use the maximal width QPixmap paddedImage(QSize(PREVIEW_WIDTH, pixmap.height()));