Skip to content

Commit cf026e8

Browse files
committed
fixed current shader tab
1 parent 0199902 commit cf026e8

File tree

2 files changed

+17
-13
lines changed

2 files changed

+17
-13
lines changed

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ cmake_minimum_required(VERSION 3.28)
44
# -G "Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE=/usr/local/emsdk/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake -DCMAKE_BUILD_TYPE=Debug
55

66
set(wgpu-shader-toy_RELEASE_YEAR "2024")
7-
set(wgpu-shader-toy_RELEASE_MONTH "08" )
8-
set(wgpu-shader-toy_RELEASE_DAY "18" )
7+
set(wgpu-shader-toy_RELEASE_MONTH "09" )
8+
set(wgpu-shader-toy_RELEASE_DAY "08" )
99

1010
set(wgpu-shader-toy_VERSION "${wgpu-shader-toy_RELEASE_YEAR}.${wgpu-shader-toy_RELEASE_MONTH}.${wgpu-shader-toy_RELEASE_DAY}")
1111

src/cpp/MainWindow.cpp

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ void MainWindow::renderMainMenuBar()
382382
saveState();
383383
if(ImGui::MenuItem("Export (disk)"))
384384
promptExportProject();
385-
if(ImGui::MenuItem("Quick Export (disk)", getShortcutString("D")))
385+
if(ImGui::MenuItem("Quick Export (disk)", getShortcutString("S")))
386386
exportProject();
387387
if(ImGui::MenuItem("Import (disk)"))
388388
importFromDisk();
@@ -1106,15 +1106,19 @@ void MainWindow::maybeNewFragmentShader(std::string const &iTitle, std::string c
11061106
//------------------------------------------------------------------------
11071107
void MainWindow::setCurrentFragmentShader(std::shared_ptr<FragmentShader> iFragmentShader)
11081108
{
1109-
fCurrentFragmentShader = std::move(iFragmentShader);
1110-
if(fLayoutManual)
1111-
fFragmentShaderWindow->resize(fCurrentFragmentShader->getWindowSize());
1112-
else
1113-
fCurrentFragmentShader->setWindowSize(fFragmentShaderWindow->getSize());
1114-
fFragmentShaderWindow->setCurrentFragmentShader(fCurrentFragmentShader);
1115-
auto title = fmt::printf("WebGPU Shader Toy | %s", fCurrentFragmentShader->getName());
1116-
setTitle(title);
1117-
fFragmentShaderWindow->setTitle(title);
1109+
if(fCurrentFragmentShader != iFragmentShader)
1110+
{
1111+
fCurrentFragmentShader = std::move(iFragmentShader);
1112+
if(fLayoutManual)
1113+
fFragmentShaderWindow->resize(fCurrentFragmentShader->getWindowSize());
1114+
else
1115+
fCurrentFragmentShader->setWindowSize(fFragmentShaderWindow->getSize());
1116+
fFragmentShaderWindow->setCurrentFragmentShader(fCurrentFragmentShader);
1117+
auto title = fmt::printf("WebGPU Shader Toy | %s", fCurrentFragmentShader->getName());
1118+
setTitle(title);
1119+
fFragmentShaderWindow->setTitle(title);
1120+
fCurrentFragmentShaderNameRequest = fCurrentFragmentShader->getName();
1121+
}
11181122
}
11191123

11201124
//------------------------------------------------------------------------
@@ -1384,7 +1388,7 @@ void MainWindow::newAboutDialog()
13841388
ImGui::Text("And to have fun while doing it :)");
13851389
ImGui::SeparatorText("Versions");
13861390
ImGui::Text("Version: %s", kFullVersion);
1387-
ImGui::Text("emscripten: %d.%d.%d", __EMSCRIPTEN_major__, __EMSCRIPTEN_minor__, __EMSCRIPTEN_tiny__);
1391+
ImGui::Text("Emscripten: %d.%d.%d", __EMSCRIPTEN_major__, __EMSCRIPTEN_minor__, __EMSCRIPTEN_tiny__);
13881392
ImGui::Text("ImGui: %s", IMGUI_VERSION);
13891393
ImGui::Text("GLFW: %s", glfwGetVersionString());
13901394
})

0 commit comments

Comments
 (0)