piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-14 21:37:52 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #8745 from AdmiralCurtiss/savestate-load-callback-qt

Browse Source 
Qt/Debugger: Refresh on savestate load.
This commit is contained in:
Léo Lam 2020-04-27 15:29:55 +02:00 committed by GitHub
commit bab04155b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/DolphinQt/Debugger/CodeViewWidget.cpp
View File

@ -30,6 +30,7 @@
#include "Core/PowerPC/PPCSymbolDB.h"
#include "Core/PowerPC/PowerPC.h"
#include "DolphinQt/Debugger/PatchInstructionDialog.h"
#include "DolphinQt/Host.h"
#include "DolphinQt/Resources.h"
#include "DolphinQt/Settings.h"
@ -165,6 +166,10 @@ CodeViewWidget::CodeViewWidget()
m_address = PC;
Update();
});
connect(Host::GetInstance(), &Host::UpdateDisasmDialog, this, [this] {
m_address = PC;
Update();
});
connect(&Settings::Instance(), &Settings::ThemeChanged, this, &CodeViewWidget::Update);
}

2
Source/Core/DolphinQt/Debugger/JITWidget.cpp
View File

@ -15,6 +15,7 @@
#include "Core/PowerPC/PPCAnalyst.h"
#include "UICommon/Disassembler.h"
#include "DolphinQt/Host.h"
#include "DolphinQt/Settings.h"
JITWidget::JITWidget(QWidget* parent) : QDockWidget(parent)
@ -47,6 +48,7 @@ JITWidget::JITWidget(QWidget* parent) : QDockWidget(parent)
[this](bool enabled) { setHidden(!enabled || !Settings::Instance().IsJITVisible()); });
connect(&Settings::Instance(), &Settings::EmulationStateChanged, this, &JITWidget::Update);
connect(Host::GetInstance(), &Host::UpdateDisasmDialog, this, &JITWidget::Update);
ConnectWidgets();

2
Source/Core/DolphinQt/Debugger/MemoryViewWidget.cpp
View File

@ -19,6 +19,7 @@
#include "Core/HW/AddressSpace.h"
#include "Core/PowerPC/BreakPoints.h"
#include "Core/PowerPC/PowerPC.h"
#include "DolphinQt/Host.h"
#include "DolphinQt/Resources.h"
#include "DolphinQt/Settings.h"
@ -37,6 +38,7 @@ MemoryViewWidget::MemoryViewWidget(QWidget* parent) : QTableWidget(parent)
connect(&Settings::Instance(), &Settings::DebugFontChanged, this, &QWidget::setFont);
connect(&Settings::Instance(), &Settings::EmulationStateChanged, this, [this] { Update(); });
connect(Host::GetInstance(), &Host::UpdateDisasmDialog, this, &MemoryViewWidget::Update);
connect(this, &MemoryViewWidget::customContextMenuRequested, this,
&MemoryViewWidget::OnContextMenu);
connect(&Settings::Instance(), &Settings::ThemeChanged, this, &MemoryViewWidget::Update);

2
Source/Core/DolphinQt/Debugger/MemoryWidget.cpp
View File

@ -25,6 +25,7 @@
#include "Core/ConfigManager.h"
#include "Core/HW/AddressSpace.h"
#include "DolphinQt/Debugger/MemoryViewWidget.h"
#include "DolphinQt/Host.h"
#include "DolphinQt/QtUtils/ModalMessageBox.h"
#include "DolphinQt/Settings.h"
@ -54,6 +55,7 @@ MemoryWidget::MemoryWidget(QWidget* parent) : QDockWidget(parent)
[this](bool enabled) { setHidden(!enabled || !Settings::Instance().IsMemoryVisible()); });
connect(&Settings::Instance(), &Settings::EmulationStateChanged, this, &MemoryWidget::Update);
connect(Host::GetInstance(), &Host::UpdateDisasmDialog, this, &MemoryWidget::Update);
LoadSettings();

3
Source/Core/DolphinQt/Debugger/WatchWidget.cpp
View File

@ -17,6 +17,7 @@
#include "Core/PowerPC/MMU.h"
#include "Core/PowerPC/PowerPC.h"
#include "DolphinQt/Host.h"
#include "DolphinQt/QtUtils/ModalMessageBox.h"
#include "DolphinQt/Resources.h"
#include "DolphinQt/Settings.h"
@ -49,6 +50,8 @@ WatchWidget::WatchWidget(QWidget* parent) : QDockWidget(parent)
Update();
});
connect(Host::GetInstance(), &Host::UpdateDisasmDialog, this, &WatchWidget::Update);
connect(&Settings::Instance(), &Settings::WatchVisibilityChanged,
[this](bool visible) { setHidden(!visible); });

11
Source/Core/DolphinQt/Host.cpp
View File

@ -18,6 +18,7 @@
#include "Core/Host.h"
#include "Core/NetPlayProto.h"
#include "Core/PowerPC/PowerPC.h"
#include "Core/State.h"
#include "DolphinQt/QtUtils/QueueOnObject.h"
#include "DolphinQt/Settings.h"
@ -29,7 +30,15 @@
#include "VideoCommon/RenderBase.h"
#include "VideoCommon/VideoConfig.h"
Host::Host() = default;
Host::Host()
{
State::SetOnAfterLoadCallback([this] { Host_UpdateDisasmDialog(); });
}
Host::~Host()
{
State::SetOnAfterLoadCallback(nullptr);
}
Host* Host::GetInstance()
{

2
Source/Core/DolphinQt/Host.h
View File

@ -18,6 +18,8 @@ class Host final : public QObject
Q_OBJECT
public:
~Host();
static Host* GetInstance();
bool GetRenderFocus();