Skip to content

Commit

Permalink
Merge pull request #6855 from raldone01/fix/cropped_thumbnails
Browse files Browse the repository at this point in the history
Keep aspect ratio for thumbnails
  • Loading branch information
mgallien authored Aug 20, 2024
2 parents db604b8 + e75d77c commit 3d9ed8a
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions src/gui/shellextensionsserver.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ void ShellExtensionsServer::processCustomStateRequest(QLocalSocket *socket, cons
}
_customStateSocketConnections.remove(socket->socketDescriptor());
}

const auto folder = FolderMan::instance()->folder(folderAlias);
SyncJournalFileRecord record;
if (!folder || !folder->journalDb()->getFileRecord(filePathRelative, &record) || !record.isValid()) {
Expand Down Expand Up @@ -219,7 +219,7 @@ void ShellExtensionsServer::processCustomStateRequest(QLocalSocket *socket, cons
_runningLsColJobsForPaths.removeOne(lsColJobPath);
emit directoryListingIterationFinished(folderAlias);
});

_runningLsColJobsForPaths.push_back(lsColJobPath);
lsColJob->start();
}
Expand Down Expand Up @@ -251,6 +251,7 @@ void ShellExtensionsServer::processThumbnailRequest(QLocalSocket *socket, const
queryItems.addQueryItem(QStringLiteral("fileId"), record._fileId);
queryItems.addQueryItem(QStringLiteral("x"), QString::number(thumbnailRequestInfo.size.width()));
queryItems.addQueryItem(QStringLiteral("y"), QString::number(thumbnailRequestInfo.size.height()));
queryItems.addQueryItem(QStringLiteral("a"), QStringLiteral("true")); // Keep aspect ratio
const QUrl jobUrl = Utility::concatUrlPath(folder->accountState()->account()->url(), getFetchThumbnailPath(), queryItems);
const auto job = new SimpleNetworkJob(folder->accountState()->account());
job->startRequest(QByteArrayLiteral("GET"), jobUrl);
Expand All @@ -260,7 +261,7 @@ void ShellExtensionsServer::processThumbnailRequest(QLocalSocket *socket, const
sendEmptyDataAndCloseSession(socket);
return;
}

auto messageReplyWithThumbnail = QVariantMap {
{VfsShellExtensions::Protocol::ThumnailProviderDataKey, reply->readAll().toBase64()}
};
Expand Down Expand Up @@ -319,7 +320,7 @@ void ShellExtensionsServer::parseCustomStateRequest(QLocalSocket *socket, const
sendEmptyDataAndCloseSession(socket);
return;
}

const auto customStateRequestInfo = CustomStateRequestInfo {
itemFilePath,
foundFolderAlias
Expand Down

0 comments on commit 3d9ed8a

Please sign in to comment.