otomatalabs/furnace
8
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:tildearrow/furnace

Browse source
This commit is contained in:
tildearrow 2023-06-03 01:42:06 -05:00
commit bfd7a94660
9 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/gui/gui.cpp
View file

@ -6016,7 +6016,14 @@ bool FurnaceGUI::init() {
#endif
// initialize SDL
SDL_Init(SDL_INIT_VIDEO|SDL_INIT_HAPTIC);
if (SDL_Init(SDL_INIT_VIDEO)!=0) {
logE("could not initialize video! %s",SDL_GetError());
return false;
}
if (SDL_Init(SDL_INIT_HAPTIC)!=0) {
logW("could not initialize haptic! %s",SDL_GetError());
}
const char* videoBackend=SDL_GetCurrentVideoDriver();
if (videoBackend!=NULL) {
@ -6229,7 +6236,12 @@ bool FurnaceGUI::init() {
// special consideration for Wayland
if (settings.dpiScale<0.5f) {
if (strcmp(videoBackend,"wayland")==0) {
dpiScale=(double)canvasW/(double)scrW;
if (scrW<1) {
logW("screen width is zero!\n");
dpiScale=1.0;
} else {
dpiScale=(double)canvasW/(double)scrW;
}
}
}