archive/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-09-21 03:41:42 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #7690 from NarryG/dragload-savestate

Browse source 
Reimplement savestate loading via drag and drop (resubmission of #7425)
This commit is contained in:
Léo Lam 2019-01-16 21:32:44 +01:00 committed by GitHub
commit 3892c3ac48
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 40 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
Source/Core/DolphinQt/RenderWidget.cpp
View file

@ -4,9 +4,14 @@
#include <QApplication> #include <QApplication>
#include <QDesktopWidget> #include <QDesktopWidget>
#include <QDragEnterEvent>
#include <QDropEvent>
#include <QFileInfo>
#include <QGuiApplication> #include <QGuiApplication>
#include <QIcon> #include <QIcon>
#include <QKeyEvent> #include <QKeyEvent>
#include <QMessageBox>
#include <QMimeData>
#include <QMouseEvent> #include <QMouseEvent>
#include <QPalette> #include <QPalette>
#include <QScreen> #include <QScreen>
@ -14,6 +19,7 @@
#include "Core/ConfigManager.h" #include "Core/ConfigManager.h"
#include "Core/Core.h" #include "Core/Core.h"
#include "Core/State.h"
#include "DolphinQt/Host.h" #include "DolphinQt/Host.h"
#include "DolphinQt/RenderWidget.h" #include "DolphinQt/RenderWidget.h"
@ -27,6 +33,7 @@ RenderWidget::RenderWidget(QWidget* parent) : QWidget(parent)
{ {
setWindowTitle(QStringLiteral("Dolphin")); setWindowTitle(QStringLiteral("Dolphin"));
setWindowIcon(Resources::GetAppIcon()); setWindowIcon(Resources::GetAppIcon());
setAcceptDrops(true);
QPalette p; QPalette p;
p.setColor(QPalette::Background, Qt::black); p.setColor(QPalette::Background, Qt::black);
@ -81,6 +88,37 @@ void RenderWidget::SetFillBackground(bool fill)
setAutoFillBackground(fill); setAutoFillBackground(fill);
} }
void RenderWidget::dragEnterEvent(QDragEnterEvent* event)
{
if (event->mimeData()->hasUrls() && event->mimeData()->urls().size() == 1)
event->acceptProposedAction();
}
void RenderWidget::dropEvent(QDropEvent* event)
{
const auto& urls = event->mimeData()->urls();
if (urls.empty())
return;
const auto& url = urls[0];
QFileInfo file_info(url.toLocalFile());
auto path = file_info.filePath();
if (!file_info.exists() || !file_info.isReadable())
{
QMessageBox::critical(this, tr("Error"), tr("Failed to open '%1'").arg(path));
return;
}
if (!file_info.isFile())
{
return;
}
State::LoadAs(path.toStdString());
}
void RenderWidget::OnHideCursorChanged() void RenderWidget::OnHideCursorChanged()
{ {
setCursor(Settings::Instance().GetHideCursor() ? Qt::BlankCursor : Qt::ArrowCursor); setCursor(Settings::Instance().GetHideCursor() ? Qt::BlankCursor : Qt::ArrowCursor);

2
Source/Core/DolphinQt/RenderWidget.h
View file

@ -36,6 +36,8 @@ private:
void OnKeepOnTopChanged(bool top); void OnKeepOnTopChanged(bool top);
void SetFillBackground(bool fill); void SetFillBackground(bool fill);
void OnFreeLookMouseMove(QMouseEvent* event); void OnFreeLookMouseMove(QMouseEvent* event);
void dragEnterEvent(QDragEnterEvent* event) override;
void dropEvent(QDropEvent* event) override;
static constexpr int MOUSE_HIDE_DELAY = 3000; static constexpr int MOUSE_HIDE_DELAY = 3000;
QTimer* m_mouse_timer; QTimer* m_mouse_timer;