Sfoglia il codice sorgente

fix dialog alignment

Oliver Fabel 1 anno fa
parent
commit
2c1c61c6b9
2 ha cambiato i file con 12 aggiunte e 8 eliminazioni
  1. 4 0
      CHANGELOG.md
  2. 8 8
      lib/micropython-port/mp_flipper_modflipperzero_dialog.c

+ 4 - 0
CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+* Message box alignment parameters `h` and `v` are now correctly evaluated.
+
 ## [1.1.0] - 2024-08-28
 
 ### Added

+ 8 - 8
lib/micropython-port/mp_flipper_modflipperzero_dialog.c

@@ -13,11 +13,11 @@ void mp_flipper_dialog_message_set_text(
     uint8_t v) {
     mp_flipper_context_t* ctx = mp_flipper_context;
 
-    Align align_x = x == MP_FLIPPER_ALIGN_BEGIN ? AlignLeft : AlignRight;
-    Align align_y = y == MP_FLIPPER_ALIGN_BEGIN ? AlignTop : AlignBottom;
+    Align align_x = h == MP_FLIPPER_ALIGN_BEGIN ? AlignLeft : AlignRight;
+    Align align_y = v == MP_FLIPPER_ALIGN_BEGIN ? AlignTop : AlignBottom;
 
-    align_x = x == MP_FLIPPER_ALIGN_CENTER ? AlignCenter : align_x;
-    align_y = y == MP_FLIPPER_ALIGN_CENTER ? AlignCenter : align_y;
+    align_x = h == MP_FLIPPER_ALIGN_CENTER ? AlignCenter : align_x;
+    align_y = v == MP_FLIPPER_ALIGN_CENTER ? AlignCenter : align_y;
 
     dialog_message_set_text(ctx->dialog_message, text, x, y, align_x, align_y);
 }
@@ -30,11 +30,11 @@ void mp_flipper_dialog_message_set_header(
     uint8_t v) {
     mp_flipper_context_t* ctx = mp_flipper_context;
 
-    Align align_x = x == MP_FLIPPER_ALIGN_BEGIN ? AlignLeft : AlignRight;
-    Align align_y = y == MP_FLIPPER_ALIGN_BEGIN ? AlignTop : AlignBottom;
+    Align align_x = h == MP_FLIPPER_ALIGN_BEGIN ? AlignLeft : AlignRight;
+    Align align_y = v == MP_FLIPPER_ALIGN_BEGIN ? AlignTop : AlignBottom;
 
-    align_x = x == MP_FLIPPER_ALIGN_CENTER ? AlignCenter : align_x;
-    align_y = y == MP_FLIPPER_ALIGN_CENTER ? AlignCenter : align_y;
+    align_x = h == MP_FLIPPER_ALIGN_CENTER ? AlignCenter : align_x;
+    align_y = v == MP_FLIPPER_ALIGN_CENTER ? AlignCenter : align_y;
 
     dialog_message_set_header(ctx->dialog_message, text, x, y, align_x, align_y);
 }