Merge branch 'master' of github.com:tildearrow/furnace
This commit is contained in:
commit
bfd7a94660
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -85,6 +85,7 @@ const char* aboutLine[]={
|
||||||
"Fragmare",
|
"Fragmare",
|
||||||
"freq-mod",
|
"freq-mod",
|
||||||
"gtr3qq",
|
"gtr3qq",
|
||||||
|
"Hortus",
|
||||||
"iyatemu",
|
"iyatemu",
|
||||||
"JayBOB18",
|
"JayBOB18",
|
||||||
"Jimmy-DS",
|
"Jimmy-DS",
|
||||||
|
@ -102,6 +103,7 @@ const char* aboutLine[]={
|
||||||
"MelonadeM",
|
"MelonadeM",
|
||||||
"Miker",
|
"Miker",
|
||||||
"nicco1690",
|
"nicco1690",
|
||||||
|
"niffuM",
|
||||||
"<nk>",
|
"<nk>",
|
||||||
"NyaongI",
|
"NyaongI",
|
||||||
"potatoTeto",
|
"potatoTeto",
|
||||||
|
|
|
@ -6016,7 +6016,14 @@ bool FurnaceGUI::init() {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// initialize SDL
|
// 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();
|
const char* videoBackend=SDL_GetCurrentVideoDriver();
|
||||||
if (videoBackend!=NULL) {
|
if (videoBackend!=NULL) {
|
||||||
|
@ -6229,9 +6236,14 @@ bool FurnaceGUI::init() {
|
||||||
// special consideration for Wayland
|
// special consideration for Wayland
|
||||||
if (settings.dpiScale<0.5f) {
|
if (settings.dpiScale<0.5f) {
|
||||||
if (strcmp(videoBackend,"wayland")==0) {
|
if (strcmp(videoBackend,"wayland")==0) {
|
||||||
|
if (scrW<1) {
|
||||||
|
logW("screen width is zero!\n");
|
||||||
|
dpiScale=1.0;
|
||||||
|
} else {
|
||||||
dpiScale=(double)canvasW/(double)scrW;
|
dpiScale=(double)canvasW/(double)scrW;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
rend->initGUI(sdlWin);
|
rend->initGUI(sdlWin);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue