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

Merge branch 'master' into pv1000

Browse source
This commit is contained in:
tildearrow 2023-03-05 13:37:29 -05:00
commit 604a0f6a61
3 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/gui/presets.cpp
View file

@ -1111,7 +1111,7 @@ void FurnaceGUI::initSystemPresets() {
ENTRY(
"Commander X16", {
CH(DIV_SYSTEM_VERA, 1.0f, 0, ""),
CH(DIV_SYSTEM_YM2151, 0.5f, 0, "")
CH(DIV_SYSTEM_YM2151, 1.0f, 0, "")
}
);
ENTRY(

2
src/gui/tutorial.cpp
View file

@ -245,7 +245,7 @@ void FurnaceGUI::drawTutorial() {
// tutorial
if (curTutorial>=0 && curTutorial<GUI_TUTORIAL_MAX) {
if (ImGui::Begin("Tutorial",NULL,ImGuiWindowFlags_NoResize|ImGuiWindowFlags_AlwaysAutoResize|ImGuiWindowFlags_NoTitleBar)) {
if (ImGui::Begin("Tutorial",NULL,ImGuiWindowFlags_NoResize|ImGuiWindowFlags_AlwaysAutoResize|ImGuiWindowFlags_NoTitleBar|ImGuiWindowFlags_NoDocking)) {
FurnaceGUITutorialStep& step=tutorials[curTutorial].steps[curTutorialStep];
ImGui::Dummy(ImVec2(400.0*dpiScale,1.0));
ImGui::TextWrapped("%s",step.text);