etc/furnace
0
0
Fork 0
mirror of https://github.com/tildearrow/furnace.git synced 2024-12-02 09:17:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

GUI: add channel font option

Browse source
This commit is contained in:
tildearrow 2022-09-18 04:20:08 -05:00
parent 75bcad558a
commit ebb939c189
3 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gui/gui.h
View file

@ -1178,6 +1178,7 @@ class FurnaceGUI {
int channelStyle; int channelStyle;
int channelVolStyle; int channelVolStyle;
int channelFeedbackStyle; int channelFeedbackStyle;
int channelFont;
int maxRecentFile; int maxRecentFile;
unsigned int maxUndoSteps; unsigned int maxUndoSteps;
String mainFontPath; String mainFontPath;
@ -1299,6 +1300,7 @@ class FurnaceGUI {
channelStyle(0), channelStyle(0),
channelVolStyle(0), channelVolStyle(0),
channelFeedbackStyle(1), channelFeedbackStyle(1),
channelFont(1),
maxRecentFile(10), maxRecentFile(10),
maxUndoSteps(100), maxUndoSteps(100),
mainFontPath(""), mainFontPath(""),

5
src/gui/pattern.cpp
View file

@ -523,10 +523,15 @@ void FurnaceGUI::drawPattern() {
ImGui::PushStyleColor(ImGuiCol_Text,ImGui::GetColorU32(channelTextColor(i))); ImGui::PushStyleColor(ImGuiCol_Text,ImGui::GetColorU32(channelTextColor(i)));
ImGui::TableSetBgColor(ImGuiTableBgTarget_CellBg,ImGui::GetColorU32(chanHead)); ImGui::TableSetBgColor(ImGuiTableBgTarget_CellBg,ImGui::GetColorU32(chanHead));
if (muted) ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_CHANNEL_MUTED]); if (muted) ImGui::PushStyleColor(ImGuiCol_Text,uiColors[GUI_COLOR_CHANNEL_MUTED]);
if (settings.channelFont==0) ImGui::PushFont(mainFont);
// TODO: appearance
ImGui::Selectable(chanID,true,ImGuiSelectableFlags_NoPadWithHalfSpacing,ImVec2(0.0f,lineHeight+1.0f*dpiScale)); ImGui::Selectable(chanID,true,ImGuiSelectableFlags_NoPadWithHalfSpacing,ImVec2(0.0f,lineHeight+1.0f*dpiScale));
if (displayTooltip && ImGui::IsItemHovered()) { if (displayTooltip && ImGui::IsItemHovered()) {
ImGui::SetTooltip("%s",e->getChannelName(i)); ImGui::SetTooltip("%s",e->getChannelName(i));
} }
if (settings.channelFont==0) ImGui::PopFont();
if (ImGui::IsItemClicked(ImGuiMouseButton_Left)) { if (ImGui::IsItemClicked(ImGuiMouseButton_Left)) {
if (settings.soloAction!=1 && soloTimeout>0 && soloChan==i) { if (settings.soloAction!=1 && soloTimeout>0 && soloChan==i) {
e->toggleSolo(i); e->toggleSolo(i);

12
src/gui/settings.cpp
View file

@ -1343,6 +1343,15 @@ void FurnaceGUI::drawSettings() {
settings.channelFeedbackStyle=3; settings.channelFeedbackStyle=3;
} }
ImGui::Text("Channel font:");
if (ImGui::RadioButton("Regular##CHFont0",settings.channelFont==0)) {
settings.channelFont=0;
}
if (ImGui::RadioButton("Monospace##CHFont1",settings.channelFont==1)) {
settings.channelFont=1;
}
ImGui::Separator(); ImGui::Separator();
bool insEditColorizeB=settings.insEditColorize; bool insEditColorizeB=settings.insEditColorize;
@ -2282,6 +2291,7 @@ void FurnaceGUI::syncSettings() {
settings.channelStyle=e->getConfInt("channelStyle",0); settings.channelStyle=e->getConfInt("channelStyle",0);
settings.channelVolStyle=e->getConfInt("channelVolStyle",0); settings.channelVolStyle=e->getConfInt("channelVolStyle",0);
settings.channelFeedbackStyle=e->getConfInt("channelFeedbackStyle",1); settings.channelFeedbackStyle=e->getConfInt("channelFeedbackStyle",1);
settings.channelFont=e->getConfInt("channelFont",1);
settings.maxRecentFile=e->getConfInt("maxRecentFile",10); settings.maxRecentFile=e->getConfInt("maxRecentFile",10);
clampSetting(settings.mainFontSize,2,96); clampSetting(settings.mainFontSize,2,96);
@ -2381,6 +2391,7 @@ void FurnaceGUI::syncSettings() {
clampSetting(settings.channelStyle,0,5); clampSetting(settings.channelStyle,0,5);
clampSetting(settings.channelVolStyle,0,3); clampSetting(settings.channelVolStyle,0,3);
clampSetting(settings.channelFeedbackStyle,0,3); clampSetting(settings.channelFeedbackStyle,0,3);
clampSetting(settings.channelFont,0,1);
clampSetting(settings.maxRecentFile,0,30); clampSetting(settings.maxRecentFile,0,30);
settings.initialSys=e->decodeSysDesc(e->getConfString("initialSys","")); settings.initialSys=e->decodeSysDesc(e->getConfString("initialSys",""));
@ -2536,6 +2547,7 @@ void FurnaceGUI::commitSettings() {
e->setConf("channelStyle",settings.channelStyle); e->setConf("channelStyle",settings.channelStyle);
e->setConf("channelVolStyle",settings.channelVolStyle); e->setConf("channelVolStyle",settings.channelVolStyle);
e->setConf("channelFeedbackStyle",settings.channelFeedbackStyle); e->setConf("channelFeedbackStyle",settings.channelFeedbackStyle);
e->setConf("channelFont",settings.channelFont);
e->setConf("maxRecentFile",settings.maxRecentFile); e->setConf("maxRecentFile",settings.maxRecentFile);
// colors // colors