diff options
author | JF <jf@codingfield.com> | 2020-10-27 21:55:18 +0100 |
---|---|---|
committer | JF <jf@codingfield.com> | 2020-10-27 21:55:18 +0100 |
commit | 7de43a16608e599369867cb3cfa7d5776a5b6380 (patch) | |
tree | 1750edfed02f547102e468eca485caab3b08e98d /src/displayapp/screens/Tile.cpp | |
parent | 5983e33b8d7702800dc91a3229b9a7cee75eb006 (diff) | |
parent | c5bf09d21b2ed8e2435ec625e351594f58713924 (diff) |
Fix conflicts
Diffstat (limited to 'src/displayapp/screens/Tile.cpp')
-rw-r--r-- | src/displayapp/screens/Tile.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/displayapp/screens/Tile.cpp b/src/displayapp/screens/Tile.cpp index deb88472..75fa6ef5 100644 --- a/src/displayapp/screens/Tile.cpp +++ b/src/displayapp/screens/Tile.cpp @@ -30,7 +30,7 @@ Tile::Tile(DisplayApp* app, std::array<Applications, 6>& applications) : Screen( } modal.reset(new Modal(app)); - btnm1 = lv_btnm_create(lv_scr_act(), NULL); + btnm1 = lv_btnm_create(lv_scr_act(), nullptr); lv_btnm_set_map(btnm1, btnm_map1); lv_obj_set_size(btnm1, LV_HOR_RES, LV_VER_RES); |