libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2025-01-26 11:16:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Correct GE debugger font size in small window mode.

Browse Source 
This should handle high and low DPI cases correctly, to avoid making the
text unreadably small.
This commit is contained in:
Unknown W. Brackets 2017-03-12 12:17:35 -07:00
parent b0bd7e3c6f
commit ef57eafaad
8 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Core/Core.cpp
View File

@ -166,6 +166,8 @@ bool UpdateScreenScale(int width, int height) {
g_dpi = 96;
g_dpi_scale = 1.0f;
#endif
g_dpi_scale_real = g_dpi_scale;
smallWindow = IsWindowSmall(width, height);
if (smallWindow) {
g_dpi /= 2;

6
Windows/GEDebugger/CtrlDisplayListView.cpp
View File

@ -45,8 +45,10 @@ CtrlDisplayListView::CtrlDisplayListView(HWND _wnd)
instructionSize = 4;
int fontHeight = g_Config.iFontHeight / g_dpi_scale;
int charWidth = g_Config.iFontWidth / g_dpi_scale;
// In small window mode, g_dpi_scal may have been adjusted.
const float fontScale = 1.0f / g_dpi_scale_real;
int fontHeight = g_Config.iFontHeight * fontScale;
int charWidth = g_Config.iFontWidth * fontScale;
rowHeight = fontHeight +2;

3
android/jni/app-android.cpp
View File

@ -636,6 +636,7 @@ extern "C" void Java_org_ppsspp_ppsspp_NativeRenderer_displayResize(JNIEnv *, jo
/*
g_dpi = dpi;
g_dpi_scale = 240.0f / (float)g_dpi;
g_dpi_scale_real = g_dpi_scale;
pixel_xres = w;
pixel_yres = h;
@ -652,6 +653,7 @@ extern "C" void Java_org_ppsspp_ppsspp_NativeRenderer_displayResize(JNIEnv *, jo
g_dpi = (int)display_dpi;
g_dpi_scale = 240.0f / (float)g_dpi;
g_dpi_scale_real = g_dpi_scale;
dp_xres = display_xres * g_dpi_scale;
dp_yres = display_yres * g_dpi_scale;
@ -968,6 +970,7 @@ extern "C" void JNICALL Java_org_ppsspp_ppsspp_NativeApp_backbufferResize(JNIEnv
g_dpi = (int)display_dpi;
g_dpi_scale = 240.0f / (float)g_dpi;
g_dpi_scale_real = g_dpi_scale;
dp_xres = display_xres * g_dpi_scale;
dp_yres = display_yres * g_dpi_scale;

1
ext/native/base/PCMain.cpp
View File

@ -636,6 +636,7 @@ int main(int argc, char *argv[]) {
pixel_in_dps = (float)pixel_xres / dp_xres;
g_dpi_scale = dp_xres / (float)pixel_xres;
g_dpi_scale_real = g_dpi_scale;
printf("Pixels: %i x %i\n", pixel_xres, pixel_yres);
printf("Virtual pixels: %i x %i\n", dp_xres, dp_yres);

1
ext/native/base/QtMain.cpp
View File

@ -442,6 +442,7 @@ int main(int argc, char *argv[])
pixel_xres = res.width();
pixel_yres = res.height();
g_dpi_scale = CalculateDPIScale();
g_dpi_scale_real = g_dpi_scale;
dp_xres = (int)(pixel_xres * g_dpi_scale); dp_yres = (int)(pixel_yres * g_dpi_scale);
std::string savegame_dir = ".";
std::string assets_dir = ".";

1
ext/native/base/display.cpp
View File

@ -8,6 +8,7 @@ int pixel_yres;
int g_dpi = 1; // will be overwritten
float g_dpi_scale = 1.0f;
float g_dpi_scale_real = 1.0f;
float pixel_in_dps = 1.0f;
float display_hz = 60.0f;

3
ext/native/base/display.h
View File

@ -12,6 +12,7 @@ extern int pixel_yres;
extern int g_dpi;
extern float g_dpi_scale;
extern float g_dpi_scale_real;
extern float pixel_in_dps;
extern float display_hz;
@ -25,4 +26,4 @@ enum class DisplayRotation {
};
extern DisplayRotation g_display_rotation;
extern Matrix4x4 g_display_rot_matrix;
extern Matrix4x4 g_display_rot_matrix;

1
ios/ViewController.mm
View File

@ -177,6 +177,7 @@ static GraphicsContext *graphicsContext;
g_dpi = (IS_IPAD() ? 200 : 150) * scale;
g_dpi_scale = 240.0f / (float)g_dpi;
g_dpi_scale_real = g_dpi_scale;
pixel_xres = size.width * scale;
pixel_yres = size.height * scale;