diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/infosidebarpage.cpp | 11 | ||||
| -rw-r--r-- | src/pixmapviewer.cpp | 4 |
2 files changed, 1 insertions, 14 deletions
diff --git a/src/infosidebarpage.cpp b/src/infosidebarpage.cpp index 943033876..30c4467b4 100644 --- a/src/infosidebarpage.cpp +++ b/src/infosidebarpage.cpp @@ -172,17 +172,6 @@ void InfoSidebarPage::resizeEvent(QResizeEvent* event) // try to increase the preview as large as possible m_preview->setSizeHint(QSize(maxWidth, maxWidth)); - - // --- - // TODO: The following workaround was not necessary with Qt 4.3.x - // but is mandatory with the current Qt4.4 beta version. Check with - // Qt 4.4.0 whether the issue is Dolphin specific - // (see PixmapViewer::setSizeHint()) or a regression in Qt. - QVBoxLayout* vBox = static_cast<QVBoxLayout*>(layout()); - vBox->removeWidget(m_preview); - vBox->insertWidget(0, m_preview); - // --- - m_urlCandidate = m_shownUrl; // reset the URL candidate if a resizing is done m_timer->start(TimerDelay); diff --git a/src/pixmapviewer.cpp b/src/pixmapviewer.cpp index f535475aa..416e53f1f 100644 --- a/src/pixmapviewer.cpp +++ b/src/pixmapviewer.cpp @@ -77,9 +77,7 @@ void PixmapViewer::setPixmap(const QPixmap& pixmap) void PixmapViewer::setSizeHint(const QSize& size) { m_sizeHint = size; - if ((parentWidget() != 0) && (parentWidget()->layout() != 0)) { - parentWidget()->layout()->activate(); - } + updateGeometry(); } QSize PixmapViewer::sizeHint() const |