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

GUI: don't rename settings

Browse source
This commit is contained in:
tildearrow 2022-08-25 22:09:32 -05:00
parent 3597e57bb2
commit 24c5ba89e2
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/gui/gui.h
View file

@ -1085,7 +1085,7 @@ class FurnaceGUI {
int roundedButtons; int roundedButtons;
int roundedMenus; int roundedMenus;
int loadJapanese; int loadJapanese;
int loadChineseSimplified; int loadChinese;
int loadChineseTraditional; int loadChineseTraditional;
int loadKorean; int loadKorean;
int fmLayout; int fmLayout;
@ -1204,7 +1204,7 @@ class FurnaceGUI {
roundedButtons(1), roundedButtons(1),
roundedMenus(0), roundedMenus(0),
loadJapanese(0), loadJapanese(0),
loadChineseSimplified(0), loadChinese(0),
loadChineseTraditional(0), loadChineseTraditional(0),
loadKorean(0), loadKorean(0),
fmLayout(0), fmLayout(0),

14
src/gui/settings.cpp
View file

@ -1072,9 +1072,9 @@ void FurnaceGUI::drawSettings() {
); );
} }
bool loadChineseSimplifiedB=settings.loadChineseSimplified; bool loadChineseB=settings.loadChinese;
if (ImGui::Checkbox("Display Chinese (Simplified) characters",&loadChineseSimplifiedB)) { if (ImGui::Checkbox("Display Chinese (Simplified) characters",&loadChineseB)) {
settings.loadChineseSimplified=loadChineseSimplifiedB; settings.loadChinese=loadChineseB;
} }
if (ImGui::IsItemHovered()) { if (ImGui::IsItemHovered()) {
ImGui::SetTooltip( ImGui::SetTooltip(
@ -2196,7 +2196,7 @@ void FurnaceGUI::syncSettings() {
settings.roundedButtons=e->getConfInt("roundedButtons",1); settings.roundedButtons=e->getConfInt("roundedButtons",1);
settings.roundedMenus=e->getConfInt("roundedMenus",0); settings.roundedMenus=e->getConfInt("roundedMenus",0);
settings.loadJapanese=e->getConfInt("loadJapanese",0); settings.loadJapanese=e->getConfInt("loadJapanese",0);
settings.loadChineseSimplified=e->getConfInt("loadChineseSimplified",0); settings.loadChinese=e->getConfInt("loadChinese",0);
settings.loadChineseTraditional=e->getConfInt("loadChineseTraditional",0); settings.loadChineseTraditional=e->getConfInt("loadChineseTraditional",0);
settings.loadKorean=e->getConfInt("loadKorean",0); settings.loadKorean=e->getConfInt("loadKorean",0);
settings.fmLayout=e->getConfInt("fmLayout",0); settings.fmLayout=e->getConfInt("fmLayout",0);
@ -2302,7 +2302,7 @@ void FurnaceGUI::syncSettings() {
clampSetting(settings.roundedButtons,0,1); clampSetting(settings.roundedButtons,0,1);
clampSetting(settings.roundedMenus,0,1); clampSetting(settings.roundedMenus,0,1);
clampSetting(settings.loadJapanese,0,1); clampSetting(settings.loadJapanese,0,1);
clampSetting(settings.loadChineseSimplified,0,1); clampSetting(settings.loadChinese,0,1);
clampSetting(settings.loadChineseTraditional,0,1); clampSetting(settings.loadChineseTraditional,0,1);
clampSetting(settings.loadKorean,0,1); clampSetting(settings.loadKorean,0,1);
clampSetting(settings.fmLayout,0,6); clampSetting(settings.fmLayout,0,6);
@ -2443,7 +2443,7 @@ void FurnaceGUI::commitSettings() {
e->setConf("roundedButtons",settings.roundedButtons); e->setConf("roundedButtons",settings.roundedButtons);
e->setConf("roundedMenus",settings.roundedMenus); e->setConf("roundedMenus",settings.roundedMenus);
e->setConf("loadJapanese",settings.loadJapanese); e->setConf("loadJapanese",settings.loadJapanese);
e->setConf("loadChineseSimplified",settings.loadChineseSimplified); e->setConf("loadChinese",settings.loadChinese);
e->setConf("loadChineseTraditional",settings.loadChineseTraditional); e->setConf("loadChineseTraditional",settings.loadChineseTraditional);
e->setConf("loadKorean",settings.loadKorean); e->setConf("loadKorean",settings.loadKorean);
e->setConf("fmLayout",settings.fmLayout); e->setConf("fmLayout",settings.fmLayout);
@ -3093,7 +3093,7 @@ void FurnaceGUI::applyUISettings(bool updateFonts) {
if (settings.loadJapanese) { if (settings.loadJapanese) {
range.AddRanges(ImGui::GetIO().Fonts->GetGlyphRangesJapanese()); range.AddRanges(ImGui::GetIO().Fonts->GetGlyphRangesJapanese());
} }
if (settings.loadChineseSimplified) { if (settings.loadChinese) {
range.AddRanges(ImGui::GetIO().Fonts->GetGlyphRangesChineseSimplifiedCommon()); range.AddRanges(ImGui::GetIO().Fonts->GetGlyphRangesChineseSimplifiedCommon());
} }
if (settings.loadChineseTraditional) { if (settings.loadChineseTraditional) {