Skip to content

Commit dc2b5f0

Browse files
committed
Restore Tile.cpp changes
1 parent 3e42297 commit dc2b5f0

2 files changed

Lines changed: 6 additions & 4 deletions

File tree

src/displayapp/screens/Tile.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ namespace {
1212

1313
static void event_handler(lv_obj_t* obj, lv_event_t event) {
1414
Tile* screen = static_cast<Tile*>(obj->user_data);
15-
screen->OnObjectEvent(obj, event);
15+
uint32_t* eventDataPtr = (uint32_t*) lv_event_get_data();
16+
uint32_t eventData = *eventDataPtr;
17+
screen->OnObjectEvent(obj, event, eventData);
1618
}
1719
}
1820

@@ -123,9 +125,9 @@ bool Tile::Refresh() {
123125
return running;
124126
}
125127

126-
void Tile::OnObjectEvent(lv_obj_t* obj, lv_event_t event) {
128+
void Tile::OnObjectEvent(lv_obj_t* obj, lv_event_t event, uint32_t buttonId) {
127129
if (event == LV_EVENT_VALUE_CHANGED) {
128-
app->StartApp(apps[lv_btnmatrix_get_active_btn(obj)], DisplayApp::FullRefreshDirections::Up);
130+
app->StartApp(apps[buttonId], DisplayApp::FullRefreshDirections::Up);
129131
running = false;
130132
}
131133
}

src/displayapp/screens/Tile.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ namespace Pinetime {
3232

3333
bool Refresh() override;
3434
void UpdateScreen();
35-
void OnObjectEvent(lv_obj_t* obj, lv_event_t event);
35+
void OnObjectEvent(lv_obj_t* obj, lv_event_t event, uint32_t buttonId);
3636

3737
private:
3838
Pinetime::Controllers::Battery& batteryController;

0 commit comments

Comments
 (0)