Merge branch 'master' into metal

This commit is contained in:
tildearrow 2024-04-11 22:25:44 -05:00
commit 18cad7544f
5 changed files with 383 additions and 357 deletions

View file

@ -4576,7 +4576,7 @@ void FurnaceGUI::readConfig(DivConfig& conf, FurnaceGUISettingGroups groups) {
clampSetting(settings.fontBitmap,0,1);
clampSetting(settings.fontAutoHint,0,2);
clampSetting(settings.fontAntiAlias,0,1);
clampSetting(settings.fontOversample,0,2);
clampSetting(settings.fontOversample,1,3);
clampSetting(settings.selectAssetOnLoad,0,1);
clampSetting(settings.basicColors,0,1);
clampSetting(settings.playbackTime,0,1);
@ -5730,7 +5730,7 @@ void FurnaceGUI::applyUISettings(bool updateFonts) {
fontConf.OversampleV=1;
fontConf.OversampleH=settings.fontOversample;
fontConfP.OversampleV=1;
fontConfP.OversampleH=2;
fontConfP.OversampleH=settings.fontOversample;
fontConfB.OversampleV=1;
fontConfB.OversampleH=1;
fontConfH.OversampleV=1;