aboutsummaryrefslogtreecommitdiffstats
path: root/src/displayapp/screens/Twos.h
diff options
context:
space:
mode:
authorJF002 <JF002@users.noreply.github.com>2021-04-26 21:10:11 +0200
committerGitHub <noreply@github.com>2021-04-26 21:10:11 +0200
commit4706c99db4c1e05f9dd90f152f2dea08d8f22ab2 (patch)
treecf2bea6d67e8d91a7d6222b8e0b55a0075575003 /src/displayapp/screens/Twos.h
parente56ebb8bd621cc8838e86fa032d680a6e7a35ffc (diff)
parent69898545193a82f7d72c9f47c9d9de36167b157b (diff)
Merge pull request #293 from Avamander/patch-5
Reformatted all the files according to clang-format style
Diffstat (limited to 'src/displayapp/screens/Twos.h')
-rw-r--r--src/displayapp/screens/Twos.h42
1 files changed, 20 insertions, 22 deletions
diff --git a/src/displayapp/screens/Twos.h b/src/displayapp/screens/Twos.h
index 7223c7a8..3367618f 100644
--- a/src/displayapp/screens/Twos.h
+++ b/src/displayapp/screens/Twos.h
@@ -11,30 +11,28 @@ namespace Pinetime {
};
namespace Screens {
class Twos : public Screen {
- public:
- Twos(DisplayApp* app);
- ~Twos() override;
- bool Refresh() override;
-
- bool OnTouchEvent(TouchEvents event) override;
+ public:
+ Twos(DisplayApp* app);
+ ~Twos() override;
+ bool Refresh() override;
- private:
+ bool OnTouchEvent(TouchEvents event) override;
- lv_style_t style_cell1;
- lv_style_t style_cell2;
- lv_style_t style_cell3;
- lv_style_t style_cell4;
- lv_style_t style_cell5;
-
-
- lv_obj_t *scoreText;
- lv_obj_t *gridDisplay;
- Tile grid[4][4];
- unsigned int score = 0;
- void updateGridDisplay(Tile grid[][4]);
- bool tryMerge(Tile grid[][4], int &newRow, int &newCol, int oldRow, int oldCol);
- bool tryMove(Tile grid[][4], int newRow, int newCol, int oldRow, int oldCol);
- bool placeNewTile();
+ private:
+ lv_style_t style_cell1;
+ lv_style_t style_cell2;
+ lv_style_t style_cell3;
+ lv_style_t style_cell4;
+ lv_style_t style_cell5;
+
+ lv_obj_t* scoreText;
+ lv_obj_t* gridDisplay;
+ Tile grid[4][4];
+ unsigned int score = 0;
+ void updateGridDisplay(Tile grid[][4]);
+ bool tryMerge(Tile grid[][4], int& newRow, int& newCol, int oldRow, int oldCol);
+ bool tryMove(Tile grid[][4], int newRow, int newCol, int oldRow, int oldCol);
+ bool placeNewTile();
};
}
}