forks
/
dlangui
mirror of https://github.com/buggins/dlangui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

osx hdpi fixes

This commit is contained in:
Vadim Lopatin 2024-03-07 12:14:14 +00:00
parent 3f8494c710
commit 5b97f99882
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/dlangui/core/events.d
View File

@ -52,13 +52,13 @@ struct Accelerator {
version (OSX) { version (OSX) {
static if (true) { static if (true) {
if (keyFlags & KeyFlag.Control) if (keyFlags & KeyFlag.Control)
buf ~= "Ctrl+"; buf ~= "⌃ "; //"Ctrl+";
if (keyFlags & KeyFlag.Shift) if (keyFlags & KeyFlag.Shift)
buf ~= "Shift+"; buf ~= "⇧ "; //"Shift+";
if (keyFlags & KeyFlag.Option) if (keyFlags & KeyFlag.Option)
buf ~= "Opt+"; buf ~= "⌥ "; //"Opt+";
if (keyFlags & KeyFlag.Command) if (keyFlags & KeyFlag.Command)
buf ~= "Cmd+"; buf ~= "⌘ "; //"Cmd+";
} else { } else {
if (keyFlags & KeyFlag.Control) if (keyFlags & KeyFlag.Control)
buf ~= "⌃"; buf ~= "⌃";

2
src/dlangui/core/types.d
View File

@ -348,7 +348,7 @@ private __gshared int PRIVATE_SCREEN_DPI_OVERRIDE = 0;
return PRIVATE_SCREEN_DPI_OVERRIDE ? PRIVATE_SCREEN_DPI_OVERRIDE : PRIVATE_SCREEN_DPI; return PRIVATE_SCREEN_DPI_OVERRIDE ? PRIVATE_SCREEN_DPI_OVERRIDE : PRIVATE_SCREEN_DPI;
} }
/// get screen DPI detection override value, if non 0 - this value is used instead of DPI detected by platform, if 0, value detected by platform will be used) /// get screen DPI detection override value, if non 0 - this value is used instead of DPI detected by platform, if 0, value detected by platform will be used
@property int overrideScreenDPI() { @property int overrideScreenDPI() {
return PRIVATE_SCREEN_DPI_OVERRIDE; return PRIVATE_SCREEN_DPI_OVERRIDE;
} }

8
src/dlangui/platforms/sdl/sdlapp.d
View File

@ -1618,8 +1618,11 @@ bool sdlUpdateScreenDpi(int displayIndex = 0) {
if (numDisplays < displayIndex + 1) if (numDisplays < displayIndex + 1)
return false; return false;
float hdpi = 0; float hdpi = 0;
if (SDL_GetDisplayDPI(displayIndex, null, &hdpi, null)) float ddpi = 0;
float vdpi = 0;
if (SDL_GetDisplayDPI(displayIndex, &ddpi, &hdpi, &vdpi))
return false; return false;
Log.d("SDL_GetDisplayDPI(", displayIndex, ") : ddpi=", ddpi, " hdpi=", hdpi, " vdpi=", vdpi);
int idpi = cast(int)hdpi; int idpi = cast(int)hdpi;
if (idpi < 32 || idpi > 2000) if (idpi < 32 || idpi > 2000)
return false; return false;
@ -1690,9 +1693,10 @@ int sdlmain(string[] args) {
Platform.setInstance(sdl); Platform.setInstance(sdl);
sdlUpdateScreenDpi(0);
currentTheme = createDefaultTheme(); currentTheme = createDefaultTheme();
sdlUpdateScreenDpi(0);
Platform.instance.uiTheme = "theme_default"; Platform.instance.uiTheme = "theme_default";