AstralTransRocketries/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-09-08 14:56:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Windows: Add option for display scaling support

Browse Source
This commit is contained in:
UnknownShadow200 2022-07-07 07:45:37 +10:00
parent e8f2001054
commit f75050b0c7
5 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/LScreens.c
View File

@ -1327,7 +1327,7 @@ static struct SettingsScreen {
LScreen_Layout
struct LButton btnUpdates, btnMode, btnColours, btnBack;
struct LLabel lblUpdates, lblMode, lblColours;
struct LCheckbox cbExtra, cbEmpty;
struct LCheckbox cbExtra, cbEmpty, cbScale;
struct LLine sep;
} SettingsScreen;
@ -1337,14 +1337,14 @@ static struct LWidget* settings_widgets[] = {
(struct LWidget*)&SettingsScreen.btnMode, (struct LWidget*)&SettingsScreen.lblMode,
(struct LWidget*)&SettingsScreen.btnColours, (struct LWidget*)&SettingsScreen.lblColours,
(struct LWidget*)&SettingsScreen.cbExtra, (struct LWidget*)&SettingsScreen.cbEmpty,
(struct LWidget*)&SettingsScreen.btnBack
(struct LWidget*)&SettingsScreen.btnBack, (struct LWidget*)&SettingsScreen.cbScale
};
static struct LWidget* settings_classic[] = {
(struct LWidget*)&SettingsScreen.sep,
(struct LWidget*)&SettingsScreen.btnUpdates, (struct LWidget*)&SettingsScreen.lblUpdates,
(struct LWidget*)&SettingsScreen.btnMode, (struct LWidget*)&SettingsScreen.lblMode,
(struct LWidget*)&SettingsScreen.cbExtra, (struct LWidget*)&SettingsScreen.cbEmpty,
(struct LWidget*)&SettingsScreen.btnBack
(struct LWidget*)&SettingsScreen.btnBack, (struct LWidget*)&SettingsScreen.cbScale
};
LAYOUTS set_btnUpdates[] = { { ANCHOR_CENTRE, -135 }, { ANCHOR_CENTRE, -120 } };
@ -1357,6 +1357,7 @@ LAYOUTS set_lblColours[] = { { ANCHOR_CENTRE_MIN, -70 }, { ANCHOR_CENTRE, -20
LAYOUTS set_sep[] = { { ANCHOR_CENTRE, 0 }, { ANCHOR_CENTRE, 15 } };
LAYOUTS set_cbExtra[] = { { ANCHOR_CENTRE_MIN, -190 }, { ANCHOR_CENTRE, 44 } };
LAYOUTS set_cbEmpty[] = { { ANCHOR_CENTRE_MIN, -190 }, { ANCHOR_CENTRE, 84 } };
LAYOUTS set_cbScale[] = { { ANCHOR_CENTRE_MIN, -190 }, { ANCHOR_CENTRE, 124 } };
LAYOUTS set_btnBack[] = { { ANCHOR_CENTRE, 0 }, { ANCHOR_CENTRE, 170 } };
@ -1376,6 +1377,16 @@ static void SettingsScreen_ShowEmpty(struct LCheckbox* w) {
Options_SetBool(LOPT_SHOW_EMPTY, w->value);
}
static void SettingsScreen_DPIScaling(struct LCheckbox* w) {
#if defined CC_BUILD_WIN
DisplayInfo.DPIScaling = w->value;
Options_SetBool(OPT_DPI_SCALING, w->value);
Window_ShowDialog("Restart required", "You must restart ClassiCube before display scaling takes effect");
#else
Window_ShowDialog("Restart required", "Display scaling is currently only supported on Windows");
#endif
}
static void SettingsScreen_Init(struct LScreen* s_) {
struct SettingsScreen* s = (struct SettingsScreen*)s_;
LLine_Init( &s->sep, 380, set_sep);
@ -1401,6 +1412,10 @@ static void SettingsScreen_Init(struct LScreen* s_) {
s->cbEmpty.ValueChanged = SettingsScreen_ShowEmpty;
LButton_Init( &s->btnBack, 80, 35, "Back", set_btnBack);
LCheckbox_Init(&s->cbScale, "Use display scaling", set_cbScale);
s->cbScale.ValueChanged = SettingsScreen_DPIScaling;
s->btnMode.OnClick = SwitchToChooseMode;
s->btnUpdates.OnClick = SwitchToUpdates;
s->btnColours.OnClick = SwitchToThemes;
@ -1424,6 +1439,7 @@ static void SettingsScreen_Show(struct LScreen* s_) {
LCheckbox_Set(&s->cbExtra, Options_GetBool(LOPT_AUTO_CLOSE, false));
#endif
LCheckbox_Set(&s->cbEmpty, Launcher_ShowEmptyServers);
LCheckbox_Set(&s->cbScale, DisplayInfo.DPIScaling);
}
void SettingsScreen_SetActive(void) {

1
src/Options.h
View File

@ -74,6 +74,7 @@ Copyright 2014-2022 ClassiCube | Licensed under BSD-3
#define OPT_HTTPS_VERIFY "https-verify"
#define OPT_SKIN_SERVER "http-skinserver"
#define OPT_RAW_INPUT "win-raw-input"
#define OPT_DPI_SCALING "win-dpi-scaling"
#define LOPT_SESSION "launcher-session"
#define LOPT_USERNAME "launcher-cc-username"

2
src/Program.c
View File

@ -57,13 +57,13 @@ static void SetupProgram(int argc, char** argv) {
cc_result res;
Logger_Hook();
Platform_Init();
Options_Load();
Window_Init();
res = Platform_SetDefaultCurrentDirectory(argc, argv);
if (res) Logger_SysWarn(res, "setting current directory");
Platform_LogConst("Starting " GAME_APP_NAME " ..");
String_InitArray(Server.Address, ipBuffer);
Options_Load();
}
static int RunProgram(int argc, char** argv) {

2
src/Window.h
View File

@ -55,6 +55,8 @@ CC_VAR extern struct _DisplayData {
int X, Y;
/* Size/Dimensions of this display in pixels. */
int Width, Height;
/* Whether accounting for system DPI scaling is enabled */
cc_bool DPIScaling;
} DisplayInfo;
/* Scales the given X coordinate from 96 dpi to current display dpi. */

4
src/Window_Win.c
View File

@ -284,10 +284,10 @@ void Window_Init(void) {
void* lib;
HDC hdc;
DisplayInfo.DPIScaling = Options_GetBool(OPT_DPI_SCALING, false);
DynamicLib_LoadAll(&user32, funcs, Array_Elems(funcs), &lib);
/* Enable high DPI support */
/* TODO re-enable when this can be set via option */
/* if (_SetProcessDPIAware) _SetProcessDPIAware(); */
if (DisplayInfo.DPIScaling && _SetProcessDPIAware) _SetProcessDPIAware();
hdc = GetDC(NULL);
DisplayInfo.Width = GetSystemMetrics(SM_CXSCREEN);