kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-19 00:11:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/KDE/4.12'

Browse source
This commit is contained in:
Frank Reininghaus 2013-11-22 18:00:51 +01:00
parent 0d6d678080 07a924f361
commit fc80d969f4
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
dolphin/src/CMakeLists.txt
View file

@ -170,7 +170,6 @@ set(dolphin_SRCS
dolphinapplication.cpp
dolphindockwidget.cpp
dolphinmainwindow.cpp
dolphinnewfilemenu.cpp
dolphinviewcontainer.cpp
dolphincontextmenu.cpp
filterbar/filterbar.cpp

2
dolphin/src/dolphincontextmenu.cpp
View file

@ -196,7 +196,7 @@ void DolphinContextMenu::openItemContextMenu()
if (m_selectedItems.count() == 1) {
if (m_fileInfo.isDir()) {
// setup 'Create New' menu
DolphinNewFileMenu* newFileMenu = new DolphinNewFileMenu(m_mainWindow->actionCollection(), this);
DolphinNewFileMenu* newFileMenu = new DolphinNewFileMenu(m_mainWindow->actionCollection(), m_mainWindow);
const DolphinView* view = m_mainWindow->activeViewContainer()->view();
newFileMenu->setViewShowsHiddenFiles(view->hiddenFilesShown());
newFileMenu->checkUpToDate();

11
dolphin/src/kitemviews/kitemlistcontainer.cpp
View file

@ -351,14 +351,15 @@ void KItemListContainer::updateGeometries()
? extra + scrollbarSpacing + style()->pixelMetric(QStyle::PM_ScrollBarExtent, &option, this)
: extra;
rect.adjust(0, 0, -widthDec, -heightDec);
const QRectF newGeometry(0, 0, rect.width(), rect.height());
const QRectF newGeometry(0, 0, rect.width() - widthDec,
rect.height() - heightDec);
if (m_controller->view()->geometry() != newGeometry) {
m_controller->view()->setGeometry(newGeometry);
static_cast<KItemListContainerViewport*>(viewport())->scene()->setSceneRect(0, 0, rect.width(), rect.height());
static_cast<KItemListContainerViewport*>(viewport())->viewport()->setGeometry(QRect(0, 0, rect.width(), rect.height()));
// Get the real geometry of the view again since the scrollbars
// visibilities and the view geometry may have changed in re-layout.
static_cast<KItemListContainerViewport*>(viewport())->scene()->setSceneRect(m_controller->view()->geometry());
static_cast<KItemListContainerViewport*>(viewport())->viewport()->setGeometry(m_controller->view()->geometry().toRect());
updateScrollOffsetScrollBar();
updateItemOffsetScrollBar();