Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Make sure display representation matches all cases and recreate views on window resize(this also fixes touch control layout screen).

Browse source
This commit is contained in:
LunaMoo 2015-11-13 08:50:10 +01:00 • committed by Luna
parent 57c193d742
commit 0c2efa6d44
2 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
UI/DisplayLayoutScreen.cpp
View file

@ -30,6 +30,7 @@
#include "GPU/GLES/Framebuffer.h" #include "GPU/GLES/Framebuffer.h"
static const int leftColumnWidth = 200; static const int leftColumnWidth = 200;
static const float orgRatio = 1.764706;
// Ugly hackery, need to rework some stuff to get around this // Ugly hackery, need to rework some stuff to get around this
static float local_dp_xres; static float local_dp_xres;
@ -179,9 +180,9 @@ void DisplayLayoutScreen::CreateViews() {
float horizontalBoundaryPositionL = local_dp_yres / 4.0f; float horizontalBoundaryPositionL = local_dp_yres / 4.0f;
float horizontalBoundaryPositionR = local_dp_yres - horizontalBoundaryPositionL; float horizontalBoundaryPositionR = local_dp_yres - horizontalBoundaryPositionL;
TabHolder *verticalBoundaryL = new TabHolder(ORIENT_VERTICAL, verticalBoundaryPositionL, new AnchorLayoutParams(0, 0, 0, 0, false)); TabHolder *verticalBoundaryL = new TabHolder(ORIENT_VERTICAL, verticalBoundaryPositionL, new AnchorLayoutParams(0, 0, 0, 0, false));
TabHolder *verticalBoundaryR = new TabHolder(ORIENT_VERTICAL, verticalBoundaryPositionR, new AnchorLayoutParams(0, 0, 0, 0, false)); TabHolder *verticalBoundaryR = new TabHolder(ORIENT_VERTICAL, verticalBoundaryPositionR + 4.0f, new AnchorLayoutParams(0, 0, 0, 0, false));
TabHolder *horizontalBoundaryL = new TabHolder(ORIENT_VERTICAL, verticalBoundaryPositionL * 2.0f, new AnchorLayoutParams(verticalBoundaryPositionL * 2.0f, horizontalBoundaryPositionL - 31.0f, 0, 0, true)); TabHolder *horizontalBoundaryL = new TabHolder(ORIENT_VERTICAL, verticalBoundaryPositionL * 2.0f, new AnchorLayoutParams(verticalBoundaryPositionL * 2.0f, horizontalBoundaryPositionL - 32.0f, 0, 0, true));
TabHolder *horizontalBoundaryR = new TabHolder(ORIENT_VERTICAL, verticalBoundaryPositionL * 2.0f, new AnchorLayoutParams(verticalBoundaryPositionL * 2.0f, horizontalBoundaryPositionR + 31.0f, 0, 0, true)); TabHolder *horizontalBoundaryR = new TabHolder(ORIENT_VERTICAL, verticalBoundaryPositionL * 2.0f, new AnchorLayoutParams(verticalBoundaryPositionL * 2.0f, horizontalBoundaryPositionR + 32.0f, 0, 0, true));
AnchorLayout *topBoundary = new AnchorLayout(new LayoutParams(FILL_PARENT, FILL_PARENT)); AnchorLayout *topBoundary = new AnchorLayout(new LayoutParams(FILL_PARENT, FILL_PARENT));
AnchorLayout *bottomBoundary = new AnchorLayout(new LayoutParams(FILL_PARENT, FILL_PARENT)); AnchorLayout *bottomBoundary = new AnchorLayout(new LayoutParams(FILL_PARENT, FILL_PARENT));
root_->Add(verticalBoundaryL); root_->Add(verticalBoundaryL);
@ -204,14 +205,24 @@ void DisplayLayoutScreen::CreateViews() {
mode_ = new ChoiceStrip(ORIENT_VERTICAL, new AnchorLayoutParams(leftColumnWidth, WRAP_CONTENT, 10, NONE, NONE, 158 + 64 + 10)); mode_ = new ChoiceStrip(ORIENT_VERTICAL, new AnchorLayoutParams(leftColumnWidth, WRAP_CONTENT, 10, NONE, NONE, 158 + 64 + 10));
if (g_Config.iSmallDisplayZoom == 0) { if (g_Config.iSmallDisplayZoom == 0) {
mode_->AddChoice(gr->T("Active (Auto)")); mode_->AddChoice(gr->T("Active (Auto)"));
float autoBound = bounds.w / 480.0f * 8.0f; float autoBound = local_dp_yres / 270.0f * 8.0f;
// Case of screen rotated ~ only works with buffered rendering
if (g_Config.iRenderingMode != FB_NON_BUFFERED_MODE && (g_Config.iInternalScreenRotation == ROTATION_LOCKED_VERTICAL || g_Config.iInternalScreenRotation == ROTATION_LOCKED_VERTICAL180)) {
autoBound = local_dp_yres / 480.0f * 8.0f;
} else { // Without rotation in common cases like 1080p we cut off 2 pixels of height, this reflects other cases
float resCommonWidescreen = autoBound - floor(autoBound);
if (resCommonWidescreen != 0.0f) {
float ratio = local_dp_xres / local_dp_yres;
if (ratio < orgRatio) {
autoBound = local_dp_xres / 480.0f * 8.0f;
} else {
autoBound = local_dp_yres / 272.0f * 8.0f;
}
}
}
g_Config.fSmallDisplayCustomZoom = autoBound; g_Config.fSmallDisplayCustomZoom = autoBound;
g_Config.fSmallDisplayOffsetX = 0.5f; g_Config.fSmallDisplayOffsetX = 0.5f;
g_Config.fSmallDisplayOffsetY = 0.5f; g_Config.fSmallDisplayOffsetY = 0.5f;
if (g_Config.iRenderingMode != FB_NON_BUFFERED_MODE && (g_Config.iInternalScreenRotation == ROTATION_LOCKED_VERTICAL || g_Config.iInternalScreenRotation == ROTATION_LOCKED_VERTICAL180)) {
float autoBound = bounds.h / 480.0f * 8.0f;
g_Config.fSmallDisplayCustomZoom = autoBound;
}
} else { } else {
Choice *center = new Choice(di->T("Center"), "", false, new AnchorLayoutParams(leftColumnWidth, WRAP_CONTENT, 10, NONE, NONE, 84)); Choice *center = new Choice(di->T("Center"), "", false, new AnchorLayoutParams(leftColumnWidth, WRAP_CONTENT, 10, NONE, NONE, 84));
center->OnClick.Handle(this, &DisplayLayoutScreen::OnCenter); center->OnClick.Handle(this, &DisplayLayoutScreen::OnCenter);

6
Windows/MainWindow.cpp
View file

@ -69,6 +69,7 @@
#include "GPU/GPUInterface.h" #include "GPU/GPUInterface.h"
#include "UI/OnScreenDisplay.h" #include "UI/OnScreenDisplay.h"
#include "Windows/MainWindowMenu.h" #include "Windows/MainWindowMenu.h"
#include "UI/GameSettingsScreen.h"
#define MOUSEEVENTF_FROMTOUCH_NOPEN 0xFF515780 //http://msdn.microsoft.com/en-us/library/windows/desktop/ms703320(v=vs.85).aspx #define MOUSEEVENTF_FROMTOUCH_NOPEN 0xFF515780 //http://msdn.microsoft.com/en-us/library/windows/desktop/ms703320(v=vs.85).aspx
#define MOUSEEVENTF_MASK_PLUS_PENTOUCH 0xFFFFFF80 #define MOUSEEVENTF_MASK_PLUS_PENTOUCH 0xFFFFFF80
@ -93,6 +94,7 @@ struct VerySleepy_AddrInfo {
static RECT g_normalRC = {0}; static RECT g_normalRC = {0};
static std::wstring windowTitle; static std::wstring windowTitle;
extern InputState input_state; extern InputState input_state;
extern ScreenManager *screenManager;
#define TIMER_CURSORUPDATE 1 #define TIMER_CURSORUPDATE 1
#define TIMER_CURSORMOVEUPDATE 2 #define TIMER_CURSORMOVEUPDATE 2
@ -281,6 +283,10 @@ namespace MainWindow
NativeMessageReceived("gpu resized", ""); NativeMessageReceived("gpu resized", "");
} }
if (screenManager) {
screenManager->RecreateAllViews();
}
// Don't save the window state if fullscreen. // Don't save the window state if fullscreen.
if (!g_Config.bFullScreen) { if (!g_Config.bFullScreen) {
g_WindowState = newSizingType; g_WindowState = newSizingType;