diff options
| author | Max Friedrich <minacode@users.noreply.github.com> | 2022-04-19 00:40:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-19 00:40:29 +0200 |
| commit | f84a0a38972e6b6d9a537dc9de2e2c416312f882 (patch) | |
| tree | 3ce9dab83f8b6af8e9df1c8d3aa0219f5a67acbe /src/displayapp/screens/Twos.cpp | |
| parent | a1db9fca136493eef38e536abaa660dd6ce23e57 (diff) | |
| parent | ed91b5a9981898078ad8e4cf105b5d52c7b63dfe (diff) | |
Merge branch 'develop' into remove-nm-reference
Diffstat (limited to 'src/displayapp/screens/Twos.cpp')
| -rw-r--r-- | src/displayapp/screens/Twos.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/displayapp/screens/Twos.cpp b/src/displayapp/screens/Twos.cpp index b15332f1..ca9295d5 100644 --- a/src/displayapp/screens/Twos.cpp +++ b/src/displayapp/screens/Twos.cpp @@ -90,7 +90,7 @@ Twos::Twos(Pinetime::Applications::DisplayApp* app) : Screen(app) { lv_label_set_long_mode(backgroundLabel, LV_LABEL_LONG_CROP); lv_obj_set_size(backgroundLabel, 240, 240); lv_obj_set_pos(backgroundLabel, 0, 0); - lv_label_set_text(backgroundLabel, ""); + lv_label_set_text_static(backgroundLabel, ""); } Twos::~Twos() { @@ -130,7 +130,7 @@ bool Twos::placeNewTile() { } bool Twos::tryMerge(TwosTile grid[][4], int& newRow, int& newCol, int oldRow, int oldCol) { - if ((grid[newRow][newCol].value == grid[oldRow][oldCol].value)) { + if (grid[newRow][newCol].value == grid[oldRow][oldCol].value) { if ((newCol != oldCol) || (newRow != oldRow)) { if (!grid[newRow][newCol].merged) { unsigned int newVal = grid[oldRow][oldCol].value *= 2; |