BrushEditor: size preview based on max dimension to avoid jumping

HaikuArchives · Oct 29, 2023 · 773b224 · 773b224
1 parent addb47e
commit 773b224
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/artpaint/tools/Brush.cpp b/artpaint/tools/Brush.cpp
@@ -382,13 +382,20 @@ Brush::PreviewBrush(BBitmap* preview_bitmap)
 	float preview_width = width_;
 	float preview_height = height_;
 
-	float bmap_width = preview_bitmap->Bounds().Width() + 1;
-	float bmap_height = preview_bitmap->Bounds().Height() + 1;
+	float max_dim = max_c(actual_width, actual_height);
 
-	while ((preview_width > bmap_width) || (preview_height > bmap_height)) {
-		preview_width /= 2.0;
-		preview_height /= 2.0;
+	float bmap_width = (preview_bitmap->Bounds().Width() + 1);
+	float bmap_height = (preview_bitmap->Bounds().Height() + 1);
+	int32 fac = 1;
+
+	while ((max_dim > bmap_width) || (max_dim > bmap_height)) {
+		fac *= 2;
+		max_dim /= 2;;
 	}
+
+	preview_width /= fac;
+	preview_height /= fac;
+
 	int32 scale = (int32)(width_ / preview_width);
 
 	int32 top = (int32)((bmap_height - preview_height) / 2.0);