kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-08-22 01:40:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/21.08'

Browse source
This commit is contained in:
Nate Graham 2021-08-02 10:32:31 -06:00
parent 393c659c9a f190ae1cf8
commit d472cb2a25
5 changed files with 23 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/dolphinmainwindow.cpp
View file

@ -237,20 +237,6 @@ QVector<DolphinViewContainer*> DolphinMainWindow::viewContainers() const
return viewContainers;
}
void DolphinMainWindow::setViewsWithInvalidPathsToHome()
{
const QVector<DolphinViewContainer*> theViewContainers = viewContainers();
for (DolphinViewContainer *viewContainer : theViewContainers) {
// Only consider local dirs, not remote locations and abstract protocols
if (viewContainer->url().isLocalFile()) {
if (!QFileInfo::exists(viewContainer->url().toLocalFile())) {
viewContainer->setUrl(QUrl::fromLocalFile(QDir::homePath()));
}
}
}
}
void DolphinMainWindow::openDirectories(const QList<QUrl>& dirs, bool splitView)
{
m_tabWidget->openDirectories(dirs, splitView);

6
src/dolphinmainwindow.h
View file

@ -105,12 +105,6 @@ public:
*/
void setViewsToHomeIfMountPathOpen(const QString& mountPath);
/**
* Sets any of the window's view containers which are currently displaying
* invalid locations to the home path
*/
void setViewsWithInvalidPathsToHome();
bool isFoldersPanelEnabled() const;
bool isInformationPanelEnabled() const;

13
src/dolphinnavigatorswidgetaction.cpp
View file

@ -47,6 +47,7 @@ DolphinNavigatorsWidgetAction::DolphinNavigatorsWidgetAction(QWidget *parent) :
void DolphinNavigatorsWidgetAction::adjustSpacing()
{
m_previousWindowWidth = parentWidget()->window()->width();
auto viewGeometries = m_viewGeometriesHelper.viewGeometries();
const int widthOfSplitterPrimary = viewGeometries.globalXOfPrimary + viewGeometries.widthOfPrimary - viewGeometries.globalXOfNavigatorsWidget;
const QList<int> splitterSizes = {widthOfSplitterPrimary,
@ -310,7 +311,17 @@ DolphinNavigatorsWidgetAction::ViewGeometriesHelper::ViewGeometriesHelper
bool DolphinNavigatorsWidgetAction::ViewGeometriesHelper::eventFilter(QObject *watched, QEvent *event)
{
if (event->type() == QEvent::Resize) {
m_navigatorsWidgetAction->adjustSpacing();
if (m_navigatorsWidgetAction->parentWidget()->window()->width() != m_navigatorsWidgetAction->m_previousWindowWidth) {
// The window is being resized which means not all widgets have gotten their new sizes yet.
// Let's wait a bit so the sizes of the navigatorsWidget and the viewContainers have all
// had a chance to be updated.
m_navigatorsWidgetAction->m_adjustSpacingTimer->start();
} else {
m_navigatorsWidgetAction->adjustSpacing();
// We could always use the m_adjustSpacingTimer instead of calling adjustSpacing() directly
// here but then the navigatorsWidget doesn't fluently align with the viewContainers when
// the DolphinTabPage::m_expandViewAnimation is animating.
}
return false;
}
return QObject::eventFilter(watched, event);

6
src/dolphinnavigatorswidgetaction.h
View file

@ -216,6 +216,12 @@ private:
};
ViewGeometriesHelper m_viewGeometriesHelper;
/**
* Used to check if the window has been resized.
* @see ViewGeometriesHelper::eventFilter() for why this is needed.
*/
int m_previousWindowWidth = -1;
};
#endif // DOLPHINNAVIGATORSWIDGETACTION_H

10
src/main.cpp
View file

@ -210,12 +210,12 @@ int main(int argc, char **argv)
// If the user passed any URLs to Dolphin, open those in the
// window after session-restoring it
if (startedWithURLs) {
mainWindow->openDirectories(urls, splitView);
if (openFiles) {
mainWindow->openFiles(urls, splitView);
} else {
mainWindow->openDirectories(urls, splitView);
}
}
// Now handle invalid locations in the set of active views to
// avoid issues like https://bugs.kde.org/show_bug.cgi?id=427619
mainWindow->setViewsWithInvalidPathsToHome();
} else {
qCWarning(DolphinDebug) << "Unknown class " << className << " in session saved data!";
}