Merge branch 'refs/heads/dev' into plugin

# Conflicts: # .gitmodules # CMakeLists.txt # ext/core
2025-12-13 21:45:46 +08:00
parent 9ae018341c 6dec37eef4
commit 22fd521951
20 changed files with 203 additions and 142 deletions
@@ -1201,8 +1201,11 @@ void ViewerWidget::UpdateMinimumScale()
 		// Avoids divide by zero
 		SetMinimumScale(0);
 	} else {
-		SetMinimumScale(static_cast<double>(ruler()->width()) /
-						GetConnectedNode()->GetLength().toDouble());
+		double min_scale = static_cast<double>(ruler()->width()) /
+						   GetConnectedNode()->GetLength().toDouble();
+		// Ensure min_scale doesn't exceed max_scale to prevent crash
+		min_scale = qMin(min_scale, GetMaximumScale());
+		SetMinimumScale(min_scale);
 	}
 }