From 4b41590cf1593e33b8a1ae0e86461f3c0046c1cc Mon Sep 17 00:00:00 2001
From: liamHowatt <30486941+liamHowatt@users.noreply.github.com>
Date: Wed, 20 Mar 2024 18:31:53 -0400
Subject: [PATCH] fix(flex): LV_FLEX_ALIGN_SPACE_BETWEEN align single item left
 (#5915)

---
 src/layouts/flex/lv_flex.c                   |   3 +-
 tests/ref_imgs/align_flex_center1.png        | Bin 0 -> 2275 bytes
 tests/ref_imgs/align_flex_center2.png        | Bin 0 -> 2279 bytes
 tests/ref_imgs/align_flex_space_around1.png  | Bin 0 -> 2275 bytes
 tests/ref_imgs/align_flex_space_around2.png  | Bin 0 -> 2279 bytes
 tests/ref_imgs/align_flex_space_between1.png | Bin 0 -> 2272 bytes
 tests/ref_imgs/align_flex_space_between2.png | Bin 0 -> 2274 bytes
 tests/ref_imgs/align_flex_space_evenly1.png  | Bin 0 -> 2275 bytes
 tests/ref_imgs/align_flex_space_evenly2.png  | Bin 0 -> 2280 bytes
 tests/src/test_cases/test_align_flex.c       |  80 +++++++++++++++++++
 10 files changed, 81 insertions(+), 2 deletions(-)
 create mode 100644 tests/ref_imgs/align_flex_center1.png
 create mode 100644 tests/ref_imgs/align_flex_center2.png
 create mode 100644 tests/ref_imgs/align_flex_space_around1.png
 create mode 100644 tests/ref_imgs/align_flex_space_around2.png
 create mode 100644 tests/ref_imgs/align_flex_space_between1.png
 create mode 100644 tests/ref_imgs/align_flex_space_between2.png
 create mode 100644 tests/ref_imgs/align_flex_space_evenly1.png
 create mode 100644 tests/ref_imgs/align_flex_space_evenly2.png
 create mode 100644 tests/src/test_cases/test_align_flex.c

diff --git a/src/layouts/flex/lv_flex.c b/src/layouts/flex/lv_flex.c
index 168f9de90..65a1d048e 100644
--- a/src/layouts/flex/lv_flex.c
+++ b/src/layouts/flex/lv_flex.c
@@ -472,7 +472,6 @@ static void place_content(lv_flex_align_t place, int32_t max_size, int32_t conte
 {
     if(item_cnt <= 1) {
         switch(place) {
-            case LV_FLEX_ALIGN_SPACE_BETWEEN:
             case LV_FLEX_ALIGN_SPACE_AROUND:
             case LV_FLEX_ALIGN_SPACE_EVENLY:
                 place = LV_FLEX_ALIGN_CENTER;
@@ -492,7 +491,7 @@ static void place_content(lv_flex_align_t place, int32_t max_size, int32_t conte
             *start_pos += max_size - content_size;
             break;
         case LV_FLEX_ALIGN_SPACE_BETWEEN:
-            *gap = (int32_t)(max_size - content_size) / (int32_t)(item_cnt - 1);
+            if(item_cnt > 1) *gap = (int32_t)(max_size - content_size) / (int32_t)(item_cnt - 1);
             break;
         case LV_FLEX_ALIGN_SPACE_AROUND:
             *gap += (int32_t)(max_size - content_size) / (int32_t)(item_cnt);
diff --git a/tests/ref_imgs/align_flex_center1.png b/tests/ref_imgs/align_flex_center1.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e1b373658b69c1fb25442b18a04f19368d2f201
GIT binary patch
literal 2275
zcmeAS@N?(olHy`uVBq!ia0y~yU{+vYV0^&A1QfZHI&TpJ1IH>)7srr_Id5+`@-i{<
zxH?WNaAAEH&|)1@psyBpDW&|F!~c&<kDs~2!0_VEc6J7aIlTv%7&<t07#e1bGDZVo
zG$jm+TyP_~nxQ~<{rUW-@4o+y*~uL<nO}^-!6$){;Rwr+V7!?z^DQp}!}3SXtPBFe
q5ey85jiZdwKp0I4!zLH}X8y{~v%Bl`tu?^L3xlVtpUXO@geCwyWAb(Y

literal 0
HcmV?d00001

diff --git a/tests/ref_imgs/align_flex_center2.png b/tests/ref_imgs/align_flex_center2.png
new file mode 100644
index 0000000000000000000000000000000000000000..729d020882470c59cd6201541971cca433b005dc
GIT binary patch
literal 2279
zcmeAS@N?(olHy`uVBq!ia0y~yU{+vYV0^&A1QfZHI&TpJ1IIc~7srr_Id5-l<UQmd
z;Of}J5zBfvaN_R8T+hAPUHq+1&+7EwC2#lE%$T2n!Rq`~W(J0LZV8MGM_9xd9DGI@
zqk%A*5{5-Cc(b*Np`i5r<CstHzi<9uUvM*#K`(-V!LX5)K|pv&FgE6<h2=9a><|^#
tVQ83ffQg}lbCfX}2%{-s*yMs6{HEgkyA2|aTLT*~44$rjF6*2UngChCCRP9d

literal 0
HcmV?d00001

diff --git a/tests/ref_imgs/align_flex_space_around1.png b/tests/ref_imgs/align_flex_space_around1.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e1b373658b69c1fb25442b18a04f19368d2f201
GIT binary patch
literal 2275
zcmeAS@N?(olHy`uVBq!ia0y~yU{+vYV0^&A1QfZHI&TpJ1IH>)7srr_Id5+`@-i{<
zxH?WNaAAEH&|)1@psyBpDW&|F!~c&<kDs~2!0_VEc6J7aIlTv%7&<t07#e1bGDZVo
zG$jm+TyP_~nxQ~<{rUW-@4o+y*~uL<nO}^-!6$){;Rwr+V7!?z^DQp}!}3SXtPBFe
q5ey85jiZdwKp0I4!zLH}X8y{~v%Bl`tu?^L3xlVtpUXO@geCwyWAb(Y

literal 0
HcmV?d00001

diff --git a/tests/ref_imgs/align_flex_space_around2.png b/tests/ref_imgs/align_flex_space_around2.png
new file mode 100644
index 0000000000000000000000000000000000000000..509436507af6310248438ebedd8cc5cb98824509
GIT binary patch
literal 2279
zcmeAS@N?(olHy`uVBq!ia0y~yU{+vYV0^&A1QfZHI&TpJ1IIc~7srr_Id5+q<UQoT
z!{FFdv5afiVx?V+x&HYHYsZ$%$~;gPsV#5(nSo)!=a{_=3<vU9#26fW5*Qhdj50<8
zVKgNSk6aM9TKqxTz5D+s?c9HUXNuki-sj!FKOAIY=-||0Xqa(eNHAoLH&?MUG_3tG
lS~!iC(4)1}Fw6ydrsDj&Uu%dy05)J4JYD@<);T3K0RXM*?dbpj

literal 0
HcmV?d00001

diff --git a/tests/ref_imgs/align_flex_space_between1.png b/tests/ref_imgs/align_flex_space_between1.png
new file mode 100644
index 0000000000000000000000000000000000000000..9dfebbf2688b6af9cdaa3484e4b71c0cbd9c2a0e
GIT binary patch
literal 2272
zcmeAS@N?(olHy`uVBq!ia0y~yU{+vYV0^&A1QfZHI&TpJ1IKbt7srr_Id5+m@*WNl
zU_EG2Bq@@Z?vj=+@={;r+OJ8b&JSXD?#fMzV_+z`x0;`Up+c&Wl|eu_f`P$slrb6z
zqbXrn<bsWVtN%^oi9eoxQjg)l-I@&y3`tDf3<_#PgK_)JnthB64+4jpyN6H^k2-Z|
fWr<-HU-f}Ed3G;!t}p<$To^oE{an^LB{Ts5kCbI>

literal 0
HcmV?d00001

diff --git a/tests/ref_imgs/align_flex_space_between2.png b/tests/ref_imgs/align_flex_space_between2.png
new file mode 100644
index 0000000000000000000000000000000000000000..79d86bb5a7bca7ae7a94692eeb5d08dae2cb7d68
GIT binary patch
literal 2274
zcmeAS@N?(olHy`uVBq!ia0y~yU{+vYV0^&A1QfZHI&TpJ1IJ2F7srr_Id5+`@-i{<
zxH?WNaAAEHu;pFA!M!soJSV3fJMjMF(&K0DFfhEhvz?!TVTV*BD}#V=1OtQNC}T7b
zMpMGD$ORjZzy7n1r~cmgsj&<X>T^o__{A6;d=eNLj<5^~#+w;4-%2wu=pAL}W>8Su
qz`&5iG|Ctagwd2RY;wUj=3N{4GD1Jk=LEK07(8A5T-G@yGywpQhj73E

literal 0
HcmV?d00001

diff --git a/tests/ref_imgs/align_flex_space_evenly1.png b/tests/ref_imgs/align_flex_space_evenly1.png
new file mode 100644
index 0000000000000000000000000000000000000000..3e1b373658b69c1fb25442b18a04f19368d2f201
GIT binary patch
literal 2275
zcmeAS@N?(olHy`uVBq!ia0y~yU{+vYV0^&A1QfZHI&TpJ1IH>)7srr_Id5+`@-i{<
zxH?WNaAAEH&|)1@psyBpDW&|F!~c&<kDs~2!0_VEc6J7aIlTv%7&<t07#e1bGDZVo
zG$jm+TyP_~nxQ~<{rUW-@4o+y*~uL<nO}^-!6$){;Rwr+V7!?z^DQp}!}3SXtPBFe
q5ey85jiZdwKp0I4!zLH}X8y{~v%Bl`tu?^L3xlVtpUXO@geCwyWAb(Y

literal 0
HcmV?d00001

diff --git a/tests/ref_imgs/align_flex_space_evenly2.png b/tests/ref_imgs/align_flex_space_evenly2.png
new file mode 100644
index 0000000000000000000000000000000000000000..fa63d506e2fe1a593bf31d8747841892cba9a2de
GIT binary patch
literal 2280
zcmeAS@N?(olHy`uVBq!ia0y~yU{+vYV0^&A1QfZHI&TpJ1IKz#7srr_Id5+q<UQoT
z!{FFdv5afi;zcFyqCaQLB^>p<=)?T&_@z^~&)i{PcyT9OpMjykl!==`L2UyAL((W?
zG!RBp!tlri{a3jUte<y$XUe<ZTlHsh*FWCzAloj2fx)nml|evwNH8|$riHx+7Eqc)
p%-usMh)10|Byz%Vji!zKrsDj&UmUI%1-4)qJYD@<);T3K0RRsxXORE^

literal 0
HcmV?d00001

diff --git a/tests/src/test_cases/test_align_flex.c b/tests/src/test_cases/test_align_flex.c
new file mode 100644
index 000000000..91bcaf72d
--- /dev/null
+++ b/tests/src/test_cases/test_align_flex.c
@@ -0,0 +1,80 @@
+#if LV_BUILD_TEST
+#include "../lvgl.h"
+
+#include "unity/unity.h"
+
+static lv_obj_t * active_screen = NULL;
+
+void setUp(void)
+{
+    active_screen = lv_screen_active();
+}
+
+void tearDown(void)
+{
+    lv_obj_clean(active_screen);
+}
+
+static void simple_style(lv_obj_t * obj)
+{
+    lv_obj_set_style_radius(obj, 0, LV_PART_MAIN);
+    lv_obj_set_scrollbar_mode(obj, LV_SCROLLBAR_MODE_OFF);
+    lv_obj_set_style_border_width(obj, 0, LV_PART_MAIN);
+    lv_obj_set_style_pad_all(obj, 0, LV_PART_MAIN);
+    lv_obj_set_style_margin_all(obj, 0, LV_PART_MAIN);
+    lv_obj_set_style_outline_pad(obj, 0, LV_PART_MAIN);
+    lv_obj_set_style_outline_width(obj, 0, LV_PART_MAIN);
+}
+
+static lv_obj_t * create_row(lv_flex_align_t main_place, int n_children)
+{
+    lv_obj_t * row = lv_obj_create(lv_screen_active());
+    lv_obj_set_size(row, LV_PCT(100), LV_PCT(100));
+    lv_obj_set_flex_flow(row, LV_FLEX_FLOW_ROW);
+    lv_obj_set_flex_align(row, main_place, LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_CENTER);
+    simple_style(row);
+    for(int i = 0; i < n_children; i++) {
+        lv_obj_t * child = lv_obj_create(row);
+        lv_obj_set_size(child, 40, 40);
+        lv_obj_set_style_bg_color(child, lv_palette_main(LV_PALETTE_BLUE), 0);
+        simple_style(child);
+    }
+    return row;
+}
+
+void test_align(void)
+{
+    create_row(LV_FLEX_ALIGN_CENTER, 1);
+    TEST_ASSERT_EQUAL_SCREENSHOT("align_flex_center1.png");
+    lv_obj_clean(active_screen);
+
+    create_row(LV_FLEX_ALIGN_CENTER, 2);
+    TEST_ASSERT_EQUAL_SCREENSHOT("align_flex_center2.png");
+    lv_obj_clean(active_screen);
+
+    create_row(LV_FLEX_ALIGN_SPACE_EVENLY, 1);
+    TEST_ASSERT_EQUAL_SCREENSHOT("align_flex_space_evenly1.png");
+    lv_obj_clean(active_screen);
+
+    create_row(LV_FLEX_ALIGN_SPACE_EVENLY, 2);
+    TEST_ASSERT_EQUAL_SCREENSHOT("align_flex_space_evenly2.png");
+    lv_obj_clean(active_screen);
+
+    create_row(LV_FLEX_ALIGN_SPACE_AROUND, 1);
+    TEST_ASSERT_EQUAL_SCREENSHOT("align_flex_space_around1.png");
+    lv_obj_clean(active_screen);
+
+    create_row(LV_FLEX_ALIGN_SPACE_AROUND, 2);
+    TEST_ASSERT_EQUAL_SCREENSHOT("align_flex_space_around2.png");
+    lv_obj_clean(active_screen);
+
+    create_row(LV_FLEX_ALIGN_SPACE_BETWEEN, 1);
+    TEST_ASSERT_EQUAL_SCREENSHOT("align_flex_space_between1.png");
+    lv_obj_clean(active_screen);
+
+    create_row(LV_FLEX_ALIGN_SPACE_BETWEEN, 2);
+    TEST_ASSERT_EQUAL_SCREENSHOT("align_flex_space_between2.png");
+    lv_obj_clean(active_screen);
+}
+
+#endif