Set IMGUI_VERSION_TAG to v1.92.6-docking for C.I.

encelo · encelo · commit f0aeecdbf0b9 · 2026-02-22T00:02:52.000+01:00
- Replace IM_ARRAYSIZE ImGui macro with IM_COUNTOF
- Fix compilation with renamed nCine image savers
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -7,7 +7,7 @@ env:
     Push artifact from GitHub Actions build ${{ github.run_number }} with id ${{ github.run_id }}
 
     - PROJECT_NAME artifact from branch 'BRANCH_NAME' with commit id ${{ github.sha }}
-  IMGUI_VERSION_TAG: v1.92.5-docking
+  IMGUI_VERSION_TAG: v1.92.6-docking
 
 on: [push, workflow_dispatch]
 
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -3,7 +3,7 @@ name: 'CodeQL'
 env:
   LIBRARIES_BRANCH: libraries-OS-COMPILER
   NCINE_SOURCE_BRANCH: BRANCH_NAME
-  IMGUI_VERSION_TAG: v1.92.5-docking
+  IMGUI_VERSION_TAG: v1.92.6-docking
 
 on: [push, workflow_dispatch]
 
diff --git a/.github/workflows/emscripten.yml b/.github/workflows/emscripten.yml
@@ -8,7 +8,7 @@ env:
 
     - PROJECT_NAME artifact from branch 'BRANCH_NAME' with commit id ${{ github.sha }}
   DEPLOY_BRANCH: PROJECT_NAME-BRANCH_NAME-OS-COMPILER
-  IMGUI_VERSION_TAG: v1.92.5-docking
+  IMGUI_VERSION_TAG: v1.92.6-docking
 
 on: [push, workflow_dispatch]
 
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -8,7 +8,7 @@ env:
 
     - PROJECT_NAME artifact from branch 'BRANCH_NAME' with commit id ${{ github.sha }}
   DEPLOY_BRANCH: PROJECT_NAME-BRANCH_NAME-OS-COMPILER
-  IMGUI_VERSION_TAG: v1.92.5-docking
+  IMGUI_VERSION_TAG: v1.92.6-docking
 
 on: [push, workflow_dispatch]
 
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -8,7 +8,7 @@ env:
 
     - PROJECT_NAME artifact from branch 'BRANCH_NAME' with commit id ${{ github.sha }}
   DEPLOY_BRANCH: PROJECT_NAME-BRANCH_NAME-OS-COMPILER
-  IMGUI_VERSION_TAG: v1.92.5-docking
+  IMGUI_VERSION_TAG: v1.92.6-docking
 
 on: [push, workflow_dispatch]
 
diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml
@@ -8,7 +8,7 @@ env:
 
     - PROJECT_NAME artifact from branch 'BRANCH_NAME' with commit id ${{ github.sha }}
   DEPLOY_BRANCH: PROJECT_NAME-BRANCH_NAME-OS-COMPILER
-  IMGUI_VERSION_TAG: v1.92.5-docking
+  IMGUI_VERSION_TAG: v1.92.6-docking
 
 on: [push, workflow_dispatch]
 
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -8,7 +8,7 @@ env:
 
     - PROJECT_NAME artifact from branch 'BRANCH_NAME' with commit id ${{ github.sha }}
   DEPLOY_BRANCH: PROJECT_NAME-BRANCH_NAME-OS-COMPILER
-  IMGUI_VERSION_TAG: v1.92.5-docking
+  IMGUI_VERSION_TAG: v1.92.6-docking
 
 on: [push, workflow_dispatch]
 
diff --git a/src/Canvas.cpp b/src/Canvas.cpp
@@ -5,7 +5,7 @@
 #include <ncine/Application.h>
 #include <ncine/GLTexture.h>
 #include <ncine/GLFramebufferObject.h>
-#include <ncine/TextureSaverPng.h>
+#include <ncine/ImageSaverPng.h>
 
 #include "shader_strings.h"
 
@@ -110,12 +110,12 @@ void Canvas::save(const char *filename)
 	fbo_->unbind();
 #endif
 
-	nc::TextureSaverPng saver;
-	nc::ITextureSaver::Properties props;
+	nc::ImageSaverPng saver;
+	nc::IImageSaver::Properties props;
 	props.width = texWidth_;
 	props.height = texHeight_;
 	props.pixels = pixels_.get();
-	props.format = nc::ITextureSaver::Format::RGBA8;
+	props.format = nc::IImageSaver::Format::RGBA8;
 	saver.saveToFile(props, filename);
 }
 
diff --git a/src/gui/AnimationWindow.cpp b/src/gui/AnimationWindow.cpp
@@ -113,11 +113,11 @@ void AnimationWindow::createDelayAnimationGui(IAnimation &anim)
 void AnimationWindow::createLoopAnimationGui(LoopComponent &loop)
 {
 	int currentLoopDirection = static_cast<int>(loop.direction());
-	ImGui::Combo("Direction", &currentLoopDirection, loopDirections, IM_ARRAYSIZE(loopDirections));
+	ImGui::Combo("Direction", &currentLoopDirection, loopDirections, IM_COUNTOF(loopDirections));
 	loop.setDirection(static_cast<Loop::Direction>(currentLoopDirection));
 
 	int currentLoopMode = static_cast<int>(loop.mode());
-	ImGui::Combo("Loop Mode", &currentLoopMode, loopModes, IM_ARRAYSIZE(loopModes));
+	ImGui::Combo("Loop Mode", &currentLoopMode, loopModes, IM_COUNTOF(loopModes));
 	loop.setMode(static_cast<Loop::Mode>(currentLoopMode));
 
 	if (loop.mode() != Loop::Mode::DISABLED)
@@ -197,7 +197,7 @@ void AnimationWindow::createCurveAnimationGui(CurveAnimation &anim, const CurveA
 	createDelayAnimationGui(anim);
 
 	int currentComboCurveType = static_cast<int>(anim.curve().type());
-	ImGui::Combo("Easing Curve", &currentComboCurveType, easingCurveTypes, IM_ARRAYSIZE(easingCurveTypes));
+	ImGui::Combo("Easing Curve", &currentComboCurveType, easingCurveTypes, IM_COUNTOF(easingCurveTypes));
 	anim.curve().setType(static_cast<EasingCurve::Type>(currentComboCurveType));
 
 	createLoopAnimationGui(anim.curve().loop());
@@ -356,7 +356,7 @@ void AnimationWindow::createPropertyAnimationGui(PropertyAnimation &anim)
 		currentComboProperty = static_cast<Properties::Types>(anim.propertyType());
 
 		bool setCurveShift = false;
-		if (ImGui::Combo("Property", &currentComboProperty, Properties::Strings, IM_ARRAYSIZE(Properties::Strings)))
+		if (ImGui::Combo("Property", &currentComboProperty, Properties::Strings, IM_COUNTOF(Properties::Strings)))
 			setCurveShift = true;
 		anim.setProperty(static_cast<Properties::Types>(currentComboProperty));
 		switch (currentComboProperty)
diff --git a/src/gui/AnimationsWindow.cpp b/src/gui/AnimationsWindow.cpp
@@ -76,7 +76,7 @@ void AnimationsWindow::create()
 
 	static int currentComboAnimType = 0;
 	ImGui::PushItemWidth(ImGui::GetFontSize() * 12.0f);
-	ImGui::Combo("Type", &currentComboAnimType, animationTypes, IM_ARRAYSIZE(animationTypes));
+	ImGui::Combo("Type", &currentComboAnimType, animationTypes, IM_COUNTOF(animationTypes));
 	ImGui::PopItemWidth();
 	ImGui::SameLine();
 	if (ImGui::Button(Labels::Add))
diff --git a/src/gui/CanvasGuiSection.cpp b/src/gui/CanvasGuiSection.cpp
@@ -36,7 +36,7 @@ void CanvasGuiSection::create(Canvas &canvas)
 
 	int currentResizeCombo = static_cast<int>(resizePreset_);
 	ui::comboString.clear();
-	for (unsigned int i = 0; i < IM_ARRAYSIZE(ResizeStrings); i++)
+	for (unsigned int i = 0; i < IM_COUNTOF(ResizeStrings); i++)
 	{
 		ui::comboString.formatAppend("%s", ResizeStrings[i]);
 		if (ResizePreset(i) != ResizePreset::CUSTOM &&
diff --git a/src/gui/FileDialog.cpp b/src/gui/FileDialog.cpp
@@ -325,7 +325,7 @@ bool FileDialog::create(Config &config, nctl::String &selection)
 		ImGui::SameLine();
 		static int currentComboSortingType = 0;
 		ImGui::PushItemWidth(ImGui::GetFontSize() * 8.0f);
-		ImGui::Combo(Labels::FileDialog_Sorting, &currentComboSortingType, sortingStrings, IM_ARRAYSIZE(sortingStrings));
+		ImGui::Combo(Labels::FileDialog_Sorting, &currentComboSortingType, sortingStrings, IM_COUNTOF(sortingStrings));
 		ImGui::PopItemWidth();
 		config.sorting = static_cast<Sorting>(currentComboSortingType);
 	}
diff --git a/src/gui/RenderWindow.cpp b/src/gui/RenderWindow.cpp
@@ -123,7 +123,7 @@ void RenderWindow::create()
 
 	int currentResizeCombo = static_cast<int>(resizeLevel);
 	ui::comboString.clear();
-	for (unsigned int i = 0; i < IM_ARRAYSIZE(ResizeStrings); i++)
+	for (unsigned int i = 0; i < IM_COUNTOF(ResizeStrings); i++)
 	{
 		const float resize = resizeAmount(ResizeLevel(i));
 		ui::comboString.formatAppend("%s (%d x %d)", ResizeStrings[i], static_cast<int>(theCanvas->texWidth() * resize), static_cast<int>(theCanvas->texHeight() * resize));
diff --git a/src/gui/SpriteWindow.cpp b/src/gui/SpriteWindow.cpp
@@ -169,7 +169,7 @@ void SpriteWindow::create()
 		const float halfBiggerDimension = sprite.width() > sprite.height() ? sprite.width() * 0.5f : sprite.height() * 0.5f;
 		ImGui::SliderFloat2("Anchor Point", sprite.anchorPoint.data(), -halfBiggerDimension, halfBiggerDimension);
 		static int currentAnchorSelection = 0;
-		if (ImGui::Combo("Anchor Presets", &currentAnchorSelection, anchorPointItems, IM_ARRAYSIZE(anchorPointItems)))
+		if (ImGui::Combo("Anchor Presets", &currentAnchorSelection, anchorPointItems, IM_COUNTOF(anchorPointItems)))
 		{
 			switch (currentAnchorSelection)
 			{
@@ -248,11 +248,11 @@ void SpriteWindow::create()
 
 		ImGui::Separator();
 		int currentRgbBlendingPreset = static_cast<int>(sprite.rgbBlendingPreset());
-		ImGui::Combo("RGB Blending", &currentRgbBlendingPreset, blendingPresets, IM_ARRAYSIZE(blendingPresets));
+		ImGui::Combo("RGB Blending", &currentRgbBlendingPreset, blendingPresets, IM_COUNTOF(blendingPresets));
 		sprite.setRgbBlendingPreset(static_cast<Sprite::BlendingPreset>(currentRgbBlendingPreset));
 
 		int currentAlphaBlendingPreset = static_cast<int>(sprite.alphaBlendingPreset());
-		ImGui::Combo("Alpha Blending", &currentAlphaBlendingPreset, blendingPresets, IM_ARRAYSIZE(blendingPresets));
+		ImGui::Combo("Alpha Blending", &currentAlphaBlendingPreset, blendingPresets, IM_COUNTOF(blendingPresets));
 		sprite.setAlphaBlendingPreset(static_cast<Sprite::BlendingPreset>(currentAlphaBlendingPreset));
 
 		ImGui::ColorEdit4("Color", sprite.color.data(), ImGuiColorEditFlags_AlphaBar);
