mirror of
https://github.com/InfiniTimeOrg/InfiniTime.git
synced 2024-10-22 15:11:51 +02:00
PopupMessage: draw lock with lvgl, hard code size
This commit is contained in:
parent
f0211e5fcb
commit
0954e3b2b0
|
@ -102,7 +102,6 @@ DisplayApp::DisplayApp(Drivers::St7789& lcd,
|
||||||
spiNorFlash {spiNorFlash},
|
spiNorFlash {spiNorFlash},
|
||||||
lvgl {lcd, filesystem},
|
lvgl {lcd, filesystem},
|
||||||
timer(this, TimerCallback),
|
timer(this, TimerCallback),
|
||||||
popupMessage {Screens::Symbols::lock, 90, 90},
|
|
||||||
controllers {batteryController,
|
controllers {batteryController,
|
||||||
bleController,
|
bleController,
|
||||||
dateTimeController,
|
dateTimeController,
|
||||||
|
|
|
@ -1,21 +1,40 @@
|
||||||
#include "displayapp/widgets/PopupMessage.h"
|
#include "displayapp/widgets/PopupMessage.h"
|
||||||
|
#include "displayapp/InfiniTimeTheme.h"
|
||||||
#include <libraries/log/nrf_log.h>
|
#include <libraries/log/nrf_log.h>
|
||||||
|
|
||||||
using namespace Pinetime::Applications::Widgets;
|
using namespace Pinetime::Applications::Widgets;
|
||||||
|
|
||||||
PopupMessage::PopupMessage(const char* msg, int16_t h, int16_t w) : message {msg}, height {h}, width {w} {
|
PopupMessage::PopupMessage() {
|
||||||
}
|
}
|
||||||
|
|
||||||
void PopupMessage::Create() {
|
void PopupMessage::Create() {
|
||||||
btnPopup = lv_btn_create(lv_scr_act(), nullptr);
|
popup = lv_obj_create(lv_scr_act(), nullptr);
|
||||||
btnPopup->user_data = this;
|
lv_obj_set_size(popup, 90, 90);
|
||||||
lv_obj_set_size(btnPopup, height, width);
|
lv_obj_align(popup, lv_scr_act(), LV_ALIGN_CENTER, 0, 0);
|
||||||
lv_obj_align(btnPopup, lv_scr_act(), LV_ALIGN_CENTER, 0, 0);
|
lv_obj_set_style_local_bg_color(popup, LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, Colors::bg);
|
||||||
lv_obj_set_style_local_bg_opa(btnPopup, LV_BTN_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_60);
|
lv_obj_set_style_local_bg_opa(popup, LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_60);
|
||||||
lv_obj_set_style_local_text_font(btnPopup, LV_LABEL_PART_MAIN, LV_STATE_DEFAULT, &lv_font_sys_80);
|
lv_obj_t* lockBody = lv_obj_create(popup, nullptr);
|
||||||
lv_obj_t* lblMessage = lv_label_create(btnPopup, nullptr);
|
lv_obj_set_size(lockBody, 55, 50);
|
||||||
lv_label_set_text_static(lblMessage, message);
|
lv_obj_align(lockBody, popup, LV_ALIGN_CENTER, 0, 10);
|
||||||
lv_obj_set_hidden(btnPopup, isHidden);
|
|
||||||
|
lv_obj_set_style_local_bg_color(lockBody, LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_WHITE);
|
||||||
|
lv_obj_set_style_local_bg_opa(lockBody, LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_0);
|
||||||
|
lv_obj_set_style_local_border_color(lockBody, LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_WHITE);
|
||||||
|
lv_obj_set_style_local_border_width(lockBody, LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, 22);
|
||||||
|
lv_obj_set_style_local_border_side(lockBody, LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, LV_BORDER_SIDE_FULL);
|
||||||
|
lv_obj_set_style_local_border_opa(lockBody, LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_100);
|
||||||
|
|
||||||
|
lv_obj_t* lockTop = lv_obj_create(popup, nullptr);
|
||||||
|
lv_obj_set_size(lockTop, 30, 35);
|
||||||
|
lv_obj_align(lockTop, popup, LV_ALIGN_CENTER, 0, -20);
|
||||||
|
lv_obj_set_style_local_bg_color(lockTop, LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_WHITE);
|
||||||
|
lv_obj_set_style_local_bg_opa(lockTop, LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_0);
|
||||||
|
lv_obj_set_style_local_border_color(lockTop, LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, LV_COLOR_WHITE);
|
||||||
|
lv_obj_set_style_local_border_width(lockTop, LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, 6);
|
||||||
|
lv_obj_set_style_local_border_side(lockTop, LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, LV_BORDER_SIDE_FULL);
|
||||||
|
lv_obj_set_style_local_border_opa(lockTop, LV_OBJ_PART_MAIN, LV_STATE_DEFAULT, LV_OPA_100);
|
||||||
|
|
||||||
|
lv_obj_set_hidden(popup, isHidden);
|
||||||
}
|
}
|
||||||
|
|
||||||
void PopupMessage::SetHidden(bool hidden) {
|
void PopupMessage::SetHidden(bool hidden) {
|
||||||
|
@ -24,11 +43,11 @@ void PopupMessage::SetHidden(bool hidden) {
|
||||||
}
|
}
|
||||||
isHidden = hidden;
|
isHidden = hidden;
|
||||||
// create/delete on demand
|
// create/delete on demand
|
||||||
if (btnPopup == nullptr && !isHidden) {
|
if (popup == nullptr && !isHidden) {
|
||||||
Create();
|
Create();
|
||||||
} else if (btnPopup != nullptr) {
|
} else if (popup != nullptr) {
|
||||||
lv_obj_del(btnPopup);
|
lv_obj_del(popup);
|
||||||
btnPopup = nullptr;
|
popup = nullptr;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -6,18 +6,14 @@ namespace Pinetime {
|
||||||
namespace Widgets {
|
namespace Widgets {
|
||||||
class PopupMessage {
|
class PopupMessage {
|
||||||
public:
|
public:
|
||||||
// The caller owns the message string, it is not copied.
|
PopupMessage();
|
||||||
PopupMessage(const char* msg, int16_t h, int16_t w);
|
|
||||||
void Create();
|
void Create();
|
||||||
void SetHidden(bool hidden);
|
void SetHidden(bool hidden);
|
||||||
bool IsHidden();
|
bool IsHidden();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
const char* message;
|
lv_obj_t* popup = nullptr;
|
||||||
lv_obj_t* btnPopup = nullptr;
|
|
||||||
bool isHidden = true;
|
bool isHidden = true;
|
||||||
int16_t height;
|
|
||||||
int16_t width;
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue