Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-26 23:10:38 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Remove WindowsHost

Browse Source
This commit is contained in:
Henrik Rydgård 2023-03-25 10:43:00 +01:00
parent 143f499d11
commit 7d0eac730f
4 changed files with 7 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
UI/NativeApp.cpp
View File

@ -119,9 +119,6 @@
#include "UI/RemoteISOScreen.h"
#include "UI/Theme.h"
#if !defined(MOBILE_DEVICE) && defined(USING_QT_UI)
#include "Qt/QtHost.h"
#endif
#if defined(USING_QT_UI)
#include <QFontDatabase>
#endif

4
Windows/EmuThread.cpp
View File

@ -155,7 +155,9 @@ void MainThreadFunc() {
// We'll start up a separate thread we'll call Emu
SetCurrentThreadName(useEmuThread ? "Render" : "Emu");
host = new WindowsHost();
host = new Host();
SetConsolePosition();
System_SetWindowTitle("");

30
Windows/WindowsHost.cpp
View File

@ -19,25 +19,11 @@
#include <algorithm>
// For shell links
#include "Common/CommonWindows.h"
#include "winnls.h"
#include "shobjidl.h"
#include "objbase.h"
#include "objidl.h"
#include "shlguid.h"
#pragma warning(push)
#pragma warning(disable:4091) // workaround bug in VS2015 headers
#include "shlobj.h"
#pragma warning(pop)
// native stuff
#include "Common/System/Display.h"
#include "Common/System/NativeApp.h"
#include "Common/Input/InputState.h"
#include "Common/Input/KeyCodes.h"
#include "Common/Data/Encoding/Utf8.h"
#include "Common/File/DirListing.h"
#include "Common/StringUtils.h"
#include "Core/Core.h"
@ -55,10 +41,6 @@
#include "Windows/WindowsHost.h"
#include "Windows/MainWindow.h"
#include "Windows/Debugger/DebuggerShared.h"
#include "Windows/Debugger/Debugger_Disasm.h"
#include "Windows/Debugger/Debugger_MemoryDlg.h"
#ifndef _M_ARM
#include "Windows/DinputDevice.h"
#endif
@ -66,22 +48,14 @@
#include "Windows/main.h"
static BOOL PostDialogMessage(Dialog *dialog, UINT message, WPARAM wParam = 0, LPARAM lParam = 0) {
return PostMessage(dialog->GetDlgHandle(), message, wParam, lParam);
}
WindowsHost::WindowsHost() {
SetConsolePosition();
}
void WindowsHost::SetConsolePosition() {
void SetConsolePosition() {
HWND console = GetConsoleWindow();
if (console != NULL && g_Config.iConsoleWindowX != -1 && g_Config.iConsoleWindowY != -1) {
SetWindowPos(console, NULL, g_Config.iConsoleWindowX, g_Config.iConsoleWindowY, 0, 0, SWP_NOSIZE | SWP_NOZORDER);
}
}
void WindowsHost::UpdateConsolePosition() {
void UpdateConsolePosition() {
RECT rc;
HWND console = GetConsoleWindow();
if (console != NULL && GetWindowRect(console, &rc) && !IsIconic(console)) {

14
Windows/WindowsHost.h
View File

@ -19,20 +19,10 @@
#include <memory>
#include "Common/CommonWindows.h"
#include "Core/Host.h"
#include "Windows/InputDevice.h"
class WindowsHost : public Host {
public:
WindowsHost();
~WindowsHost() {
UpdateConsolePosition();
}
private:
void SetConsolePosition();
void UpdateConsolePosition();
};
void SetConsolePosition();
void UpdateConsolePosition();
class WindowsInputManager {
public: