fixed current shader tab

pongasoft · Sep 8, 2024 · cf026e8 · cf026e8
1 parent 0199902
commit cf026e8
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,8 +4,8 @@ cmake_minimum_required(VERSION 3.28)
 # -G "Unix Makefiles" -DCMAKE_TOOLCHAIN_FILE=/usr/local/emsdk/upstream/emscripten/cmake/Modules/Platform/Emscripten.cmake -DCMAKE_BUILD_TYPE=Debug
 
 set(wgpu-shader-toy_RELEASE_YEAR  "2024")
-set(wgpu-shader-toy_RELEASE_MONTH "08"  )
-set(wgpu-shader-toy_RELEASE_DAY   "18"  )
+set(wgpu-shader-toy_RELEASE_MONTH "09"  )
+set(wgpu-shader-toy_RELEASE_DAY   "08"  )
 
 set(wgpu-shader-toy_VERSION "${wgpu-shader-toy_RELEASE_YEAR}.${wgpu-shader-toy_RELEASE_MONTH}.${wgpu-shader-toy_RELEASE_DAY}")
 

diff --git a/src/cpp/MainWindow.cpp b/src/cpp/MainWindow.cpp
@@ -382,7 +382,7 @@ void MainWindow::renderMainMenuBar()
         saveState();
       if(ImGui::MenuItem("Export (disk)"))
         promptExportProject();
-      if(ImGui::MenuItem("Quick Export (disk)", getShortcutString("D")))
+      if(ImGui::MenuItem("Quick Export (disk)", getShortcutString("S")))
         exportProject();
       if(ImGui::MenuItem("Import (disk)"))
         importFromDisk();
@@ -1106,15 +1106,19 @@ void MainWindow::maybeNewFragmentShader(std::string const &iTitle, std::string c
 //------------------------------------------------------------------------
 void MainWindow::setCurrentFragmentShader(std::shared_ptr<FragmentShader> iFragmentShader)
 {
-  fCurrentFragmentShader = std::move(iFragmentShader);
-  if(fLayoutManual)
-    fFragmentShaderWindow->resize(fCurrentFragmentShader->getWindowSize());
-  else
-    fCurrentFragmentShader->setWindowSize(fFragmentShaderWindow->getSize());
-  fFragmentShaderWindow->setCurrentFragmentShader(fCurrentFragmentShader);
-  auto title = fmt::printf("WebGPU Shader Toy | %s", fCurrentFragmentShader->getName());
-  setTitle(title);
-  fFragmentShaderWindow->setTitle(title);
+  if(fCurrentFragmentShader != iFragmentShader)
+  {
+    fCurrentFragmentShader = std::move(iFragmentShader);
+    if(fLayoutManual)
+      fFragmentShaderWindow->resize(fCurrentFragmentShader->getWindowSize());
+    else
+      fCurrentFragmentShader->setWindowSize(fFragmentShaderWindow->getSize());
+    fFragmentShaderWindow->setCurrentFragmentShader(fCurrentFragmentShader);
+    auto title = fmt::printf("WebGPU Shader Toy | %s", fCurrentFragmentShader->getName());
+    setTitle(title);
+    fFragmentShaderWindow->setTitle(title);
+    fCurrentFragmentShaderNameRequest = fCurrentFragmentShader->getName();
+  }
 }
 
 //------------------------------------------------------------------------
@@ -1384,7 +1388,7 @@ void MainWindow::newAboutDialog()
       ImGui::Text("And to have fun while doing it :)");
       ImGui::SeparatorText("Versions");
       ImGui::Text("Version:    %s", kFullVersion);
-      ImGui::Text("emscripten: %d.%d.%d", __EMSCRIPTEN_major__, __EMSCRIPTEN_minor__, __EMSCRIPTEN_tiny__);
+      ImGui::Text("Emscripten: %d.%d.%d", __EMSCRIPTEN_major__, __EMSCRIPTEN_minor__, __EMSCRIPTEN_tiny__);
       ImGui::Text("ImGui:      %s", IMGUI_VERSION);
       ImGui::Text("GLFW:       %s", glfwGetVersionString());
     })