From 8e459a4f2a7e2ba555b06494649caa50771d7507 Mon Sep 17 00:00:00 2001
From: Ryan Heuer <63077980+rmheuer@users.noreply.github.com>
Date: Mon, 6 Jan 2025 23:16:14 -0600
Subject: [PATCH] [glass] Field2d: Fix custom image padding to maintain aspect
ratio (#7648)
---
glass/src/lib/native/cpp/other/Field2D.cpp | 28 +++++++++++++++-------
1 file changed, 20 insertions(+), 8 deletions(-)
diff --git a/glass/src/lib/native/cpp/other/Field2D.cpp b/glass/src/lib/native/cpp/other/Field2D.cpp
index da7430c9ef5..609a75b1823 100644
--- a/glass/src/lib/native/cpp/other/Field2D.cpp
+++ b/glass/src/lib/native/cpp/other/Field2D.cpp
@@ -585,17 +585,29 @@ FieldFrameData FieldInfo::GetFrameData(ImVec2 min, ImVec2 max) const {
max.x -= (m_imageWidth - m_right) * scale;
max.y -= (m_imageHeight - m_bottom) * scale;
} else if ((max.x - min.x) > 40 && (max.y - min.y > 40)) {
+ // scale padding to be proportional to aspect ratio
+ float width = max.x - min.x;
+ float height = max.y - min.y;
+ float padX, padY;
+ if (width > height) {
+ padX = 20 * width / height;
+ padY = 20;
+ } else {
+ padX = 20;
+ padY = 20 * height / width;
+ }
+
// ensure there's some padding
- min.x += 20;
- max.x -= 20;
- min.y += 20;
- max.y -= 20;
+ min.x += padX;
+ max.x -= padX;
+ min.y += padY;
+ max.y -= padY;
// also pad the image so it's the same size as the box
- ffd.imageMin.x += 20;
- ffd.imageMax.x -= 20;
- ffd.imageMin.y += 20;
- ffd.imageMax.y -= 20;
+ ffd.imageMin.x += padX;
+ ffd.imageMax.x -= padX;
+ ffd.imageMin.y += padY;
+ ffd.imageMax.y -= padY;
}
ffd.min = min;