Merge pull request #3684 from thedax/instantAntiAliasing

Win32: Let NewUI's Antialiasing option be instant so a game reboot isn't required.
This commit is contained in:
Henrik Rydgård
2013-09-08 00:54:12 -07:00
6 changed files with 12 additions and 5 deletions
+1
View File
@@ -44,6 +44,7 @@ public:
virtual void InitSound(PMixer *mixer) = 0;
virtual void UpdateSound() {}
virtual void UpdateScreen() {}
virtual void ShutdownSound() = 0;
virtual void PollControllers(InputState &input_state) {}
+1
View File
@@ -334,6 +334,7 @@ UI::EventReturn GameSettingsScreen::OnBack(UI::EventParams &e) {
// If we're in-game, return to the game via DR_CANCEL.
if(PSP_IsInited()) {
screenManager()->finishDialog(this, DR_CANCEL);
host->UpdateScreen();
} else {
screenManager()->finishDialog(this, DR_OK);
}
+4
View File
@@ -159,6 +159,10 @@ void WindowsHost::UpdateUI()
PostMessage(MainWindow::GetHWND(), MainWindow::WM_USER_UPDATE_UI, 0, 0);
}
void WindowsHost::UpdateScreen()
{
PostMessage(MainWindow::GetHWND(), MainWindow::WM_USER_UPDATE_SCREEN, 0, 0);
}
void WindowsHost::UpdateMemView()
{
+1
View File
@@ -37,6 +37,7 @@ public:
void UpdateMemView();
void UpdateDisassembly();
void UpdateUI();
virtual void UpdateScreen();
void SetDebugMode(bool mode);
void AddSymbol(std::string name, u32 addr, u32 size, int type);
+4 -5
View File
@@ -1351,11 +1351,6 @@ namespace MainWindow
W32Util::MakeTopMost(hWnd, g_Config.bTopMost);
break;
case ID_OPTIONS_ANTIALIASING:
g_Config.bAntiAliasing = !g_Config.bAntiAliasing;
ResizeDisplay(true);
break;
case ID_OPTIONS_CONTROLS:
NativeMessageReceived("control mapping", "");
globalUIState = UISTATE_MENU;
@@ -1578,6 +1573,10 @@ namespace MainWindow
Update();
break;
case WM_USER_UPDATE_SCREEN:
ResizeDisplay(true);
break;
case WM_MENUSELECT:
// Unfortunately, accelerate keys (hotkeys) shares the same enabled/disabled states
// with corresponding menu items.
+1
View File
@@ -12,6 +12,7 @@ namespace MainWindow
WM_USER_LOG_STATUS_CHANGED = WM_USER + 101,
WM_USER_ATRAC_STATUS_CHANGED = WM_USER + 102,
WM_USER_UPDATE_UI = WM_USER + 103,
WM_USER_UPDATE_SCREEN = WM_USER + 104,
};
enum {