Fix compilation with newer versions of ImGui

- Fix a crash when saving a spritesheet with fractional canvas resize (#7)
- Update copyright dates to 2024

Author: encelo

CMakeLists.txt

@@ -1,7 +1,7 @@
 set(NCPROJECT_NAME "SpookyGhost")
 set(NCPROJECT_EXE_NAME "spookyghost")
 set(NCPROJECT_VENDOR "Angelo Theodorou")
-set(NCPROJECT_COPYRIGHT "Copyright ©2020-2022 ${NCPROJECT_VENDOR}")
+set(NCPROJECT_COPYRIGHT "Copyright ©2020-2024 ${NCPROJECT_VENDOR}")
 set(NCPROJECT_DESCRIPTION "A procedural sprite animation tool")
 set(NCPROJECT_HOMEPAGE "https://encelo.itch.io/spookyghost")
 set(NCPROJECT_REVERSE_DNS "io.itch.encelo.spookyghost")

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2020-2022 Angelo Theodorou
+Copyright (c) 2020-2024 Angelo Theodorou
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),

src/gui/RenderGuiWindow.cpp

@@ -304,7 +304,15 @@ void RenderGuiWindow::create()
 				saveAnimStatus_.filename.format("%s.png", nc::fs::joinPath(directory, filename).data(), saveAnimStatus_.numSavedFrames);
 				shouldSaveSpritesheet_ = true;
 				saveAnimStatus_.sheetDestPos.set(0, 0);
-				theResizedCanvas->resizeTexture(theCanvas->size() * saveAnimStatus_.canvasResize);
+				// Immediately-invoked function expression for const initialization
+				const nc::Vector2i resizeCanvasSize = [&] {
+					nc::Vector2i size(theCanvas->texWidth() * saveAnimStatus_.canvasResize,
+					                  theCanvas->texHeight() * saveAnimStatus_.canvasResize);
+					size.x = (size.x < 2) ? 2 : size.x;
+					size.y = (size.y < 2) ? 2 : size.y;
+					return size;
+				}();
+				theResizedCanvas->resizeTexture(resizeCanvasSize);
 				theSpritesheet->resizeTexture(spritesheetSize);
 				// Disabling V-Sync for faster render times
 				nc::theApplication().gfxDevice().setSwapInterval(0);

src/gui/UserInterface.cpp

@@ -1398,9 +1398,9 @@ void UserInterface::createSpritesWindow()
 			ImGui::GetIO().ConfigFlags &= ~(ImGuiConfigFlags_NavEnableKeyboard);
 			enableKeyboardNav = false;
 
-			if (enableMoveUpButton && ImGui::IsKeyReleased(ImGui::GetKeyIndex(ImGuiKey_UpArrow)))
+			if (enableMoveUpButton && ImGui::IsKeyReleased(ImGuiKey_UpArrow))
 				moveSpriteEntry(*selectedSpriteEntry_, indexInParent, true);
-			if (enableMoveDownButton && ImGui::IsKeyReleased(ImGui::GetKeyIndex(ImGuiKey_DownArrow)))
+			if (enableMoveDownButton && ImGui::IsKeyReleased(ImGuiKey_DownArrow))
 				moveSpriteEntry(*selectedSpriteEntry_, indexInParent, false);
 		}
 
@@ -1997,9 +1997,9 @@ void UserInterface::createAnimationsWindow()
 		ImGui::GetIO().ConfigFlags &= ~(ImGuiConfigFlags_NavEnableKeyboard);
 		enableKeyboardNav = false;
 
-		if (enableMoveUpButton && ImGui::IsKeyReleased(ImGui::GetKeyIndex(ImGuiKey_UpArrow)))
+		if (enableMoveUpButton && ImGui::IsKeyReleased(ImGuiKey_UpArrow))
 			nctl::swap(selectedAnimation_->parent()->anims()[selectedIndex], selectedAnimation_->parent()->anims()[selectedIndex - 1]);
-		if (enableMoveDownButton && ImGui::IsKeyReleased(ImGui::GetKeyIndex(ImGuiKey_DownArrow)))
+		if (enableMoveDownButton && ImGui::IsKeyReleased(ImGuiKey_DownArrow))
 			nctl::swap(selectedAnimation_->parent()->anims()[selectedIndex], selectedAnimation_->parent()->anims()[selectedIndex + 1]);
 	}
 
@@ -3413,9 +3413,9 @@ void UserInterface::createTipsWindow()
 		ImGui::GetIO().ConfigFlags &= ~(ImGuiConfigFlags_NavEnableKeyboard);
 		enableKeyboardNav = false;
 
-		if (enablePrevButton && ImGui::IsKeyReleased(ImGui::GetKeyIndex(ImGuiKey_LeftArrow)))
+		if (enablePrevButton && ImGui::IsKeyReleased(ImGuiKey_LeftArrow))
 			currentTipIndex--;
-		if (enableNextButton && ImGui::IsKeyReleased(ImGui::GetKeyIndex(ImGuiKey_RightArrow)))
+		if (enableNextButton && ImGui::IsKeyReleased(ImGuiKey_RightArrow))
 			currentTipIndex++;
 	}