pke: refactor for tracking padding via lbrt

1 files changed, 24 insertions, 24 deletions

diff --git a/tests/pke-test-static-ui.cpp b/tests/pke-test-static-ui.cpp
index 43ce76d..9ca4cdd 100644
--- a/tests/pke-test-static-ui.cpp
+++ b/tests/pke-test-static-ui.cpp
@@ -58,15 +58,15 @@ int pke_test_static_ui_000() {
 	PKE_TEST_ASSERT(c_ui_box->internal.h_children == 0, err_index);
 	PKE_TEST_ASSERT(c_ui_box->internal.r_children == 0, err_index);
 
-	PKE_TEST_ASSERT(ui_box->internal.px_corner_x == 10, err_index);
-	PKE_TEST_ASSERT(ui_box->internal.px_corner_y == 10, err_index);
-	PKE_TEST_ASSERT(c_ui_box->internal.px_corner_x == calculated_offset, err_index);
-	PKE_TEST_ASSERT(c_ui_box->internal.px_corner_y == calculated_offset, err_index);
+	PKE_TEST_ASSERT(ui_box->internal.px_corner.x == 10, err_index);
+	PKE_TEST_ASSERT(ui_box->internal.px_corner.y == 10, err_index);
+	PKE_TEST_ASSERT(c_ui_box->internal.px_corner.x == calculated_offset, err_index);
+	PKE_TEST_ASSERT(c_ui_box->internal.px_corner.y == calculated_offset, err_index);
 
-	PKE_TEST_ASSERT(ui_box->internal.px_width == 500, err_index);
-	PKE_TEST_ASSERT(ui_box->internal.px_height == 500, err_index);
-	PKE_TEST_ASSERT(c_ui_box->internal.px_width == 100, err_index);
-	PKE_TEST_ASSERT(c_ui_box->internal.px_height == 100, err_index);
+	PKE_TEST_ASSERT(ui_box->internal.px_size.x == 500, err_index);
+	PKE_TEST_ASSERT(ui_box->internal.px_size.y == 500, err_index);
+	PKE_TEST_ASSERT(c_ui_box->internal.px_size.x == 100, err_index);
+	PKE_TEST_ASSERT(c_ui_box->internal.px_size.y == 100, err_index);
 
 	return 0;
 }
@@ -109,18 +109,18 @@ int pke_test_static_ui_100() {
 	PKE_TEST_ASSERT(c_ui_box->internal.h_children == 0, err_index);
 	PKE_TEST_ASSERT(c_ui_box->internal.r_children == 0, err_index);
 
-	PKE_TEST_ASSERT(ui_box->internal.px_corner_x == Extent.width * 0.1, err_index);
-	PKE_TEST_ASSERT(ui_box->internal.px_corner_y == Extent.height * 0.1, err_index);
-	PKE_TEST_ASSERT(c_ui_box->internal.px_corner_x == calculated_offset_x, err_index);
-	PKE_TEST_ASSERT(c_ui_box->internal.px_corner_y == calculated_offset_y, err_index);
+	PKE_TEST_ASSERT(ui_box->internal.px_corner.x == Extent.width * 0.1, err_index);
+	PKE_TEST_ASSERT(ui_box->internal.px_corner.y == Extent.height * 0.1, err_index);
+	PKE_TEST_ASSERT(c_ui_box->internal.px_corner.x == calculated_offset_x, err_index);
+	PKE_TEST_ASSERT(c_ui_box->internal.px_corner.y == calculated_offset_y, err_index);
 
-	PKE_TEST_ASSERT(ui_box->internal.px_width == (Extent.width * 0.1) * 8, err_index);
-	PKE_TEST_ASSERT(ui_box->internal.px_height == (Extent.height * 0.1) * 8, err_index);
+	PKE_TEST_ASSERT(ui_box->internal.px_size.x == (Extent.width * 0.1) * 8, err_index);
+	PKE_TEST_ASSERT(ui_box->internal.px_size.y == (Extent.height * 0.1) * 8, err_index);
 	// TODO rounding?
 	// using a debugger, the actual and calculated values are ~0.01 off
 	// this is either a real issue or a rounding issue, either here or within pke
-	PKE_TEST_ASSERT(c_ui_box->internal.px_width == (ui_box->internal.px_width - (built_in_offset * 2)) * 0.8, err_index);
-	PKE_TEST_ASSERT(c_ui_box->internal.px_height == (ui_box->internal.px_height - (built_in_offset * 2)) * 0.8, err_index);
+	PKE_TEST_ASSERT(c_ui_box->internal.px_size.x == (ui_box->internal.px_size.x - (built_in_offset * 2)) * 0.8, err_index);
+	PKE_TEST_ASSERT(c_ui_box->internal.px_size.y == (ui_box->internal.px_size.y - (built_in_offset * 2)) * 0.8, err_index);
 
 	return 0;
 }
@@ -162,15 +162,15 @@ int pke_test_static_ui_200() {
 	PKE_TEST_ASSERT(c_ui_box->internal.h_children == 0, err_index);
 	PKE_TEST_ASSERT(c_ui_box->internal.r_children == 0, err_index);
 
-	PKE_TEST_ASSERT(ui_box->internal.px_corner_x == Extent.width * 0.1, err_index);
-	PKE_TEST_ASSERT(ui_box->internal.px_corner_y == Extent.height * 0.1, err_index);
-	PKE_TEST_ASSERT(c_ui_box->internal.px_corner_x == calculated_offset_x, err_index);
-	PKE_TEST_ASSERT(c_ui_box->internal.px_corner_y == calculated_offset_y, err_index);
+	PKE_TEST_ASSERT(ui_box->internal.px_corner.x == Extent.width * 0.1, err_index);
+	PKE_TEST_ASSERT(ui_box->internal.px_corner.y == Extent.height * 0.1, err_index);
+	PKE_TEST_ASSERT(c_ui_box->internal.px_corner.x == calculated_offset_x, err_index);
+	PKE_TEST_ASSERT(c_ui_box->internal.px_corner.y == calculated_offset_y, err_index);
 
-	PKE_TEST_ASSERT(ui_box->internal.px_width == (Extent.width * 0.1) * 8, err_index);
-	PKE_TEST_ASSERT(ui_box->internal.px_height == (Extent.height * 0.1) * 8, err_index);
-	PKE_TEST_ASSERT(c_ui_box->internal.px_width == 300, err_index);
-	PKE_TEST_ASSERT(c_ui_box->internal.px_height == 300, err_index);
+	PKE_TEST_ASSERT(ui_box->internal.px_size.x == (Extent.width * 0.1) * 8, err_index);
+	PKE_TEST_ASSERT(ui_box->internal.px_size.y == (Extent.height * 0.1) * 8, err_index);
+	PKE_TEST_ASSERT(c_ui_box->internal.px_size.x == 300, err_index);
+	PKE_TEST_ASSERT(c_ui_box->internal.px_size.y == 300, err_index);
 
 	return 0;
 }