mirror of
https://github.com/ByteWelder/Tactility.git
synced 2026-02-21 16:05:05 +00:00
Remove toolbar row padding when using flex flow
This commit is contained in:
parent
a077c3db79
commit
db4988483f
@ -145,6 +145,7 @@ void Calculator::resetCalculator() {
|
|||||||
void Calculator::onShow(AppHandle appHandle, lv_obj_t* parent) {
|
void Calculator::onShow(AppHandle appHandle, lv_obj_t* parent) {
|
||||||
lv_obj_remove_flag(parent, LV_OBJ_FLAG_SCROLLABLE);
|
lv_obj_remove_flag(parent, LV_OBJ_FLAG_SCROLLABLE);
|
||||||
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
|
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
|
||||||
|
lv_obj_set_style_pad_row(parent, 0, LV_STATE_DEFAULT);
|
||||||
|
|
||||||
lv_obj_t* toolbar = tt_lvgl_toolbar_create_for_app(parent, appHandle);
|
lv_obj_t* toolbar = tt_lvgl_toolbar_create_for_app(parent, appHandle);
|
||||||
lv_obj_align(toolbar, LV_ALIGN_TOP_MID, 0, 0);
|
lv_obj_align(toolbar, LV_ALIGN_TOP_MID, 0, 0);
|
||||||
|
|||||||
@ -74,6 +74,7 @@ public:
|
|||||||
|
|
||||||
void onShow(AppContext& app, lv_obj_t* parent) final {
|
void onShow(AppContext& app, lv_obj_t* parent) final {
|
||||||
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
|
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
|
||||||
|
lv_obj_set_style_pad_row(parent, 0, LV_STATE_DEFAULT);
|
||||||
|
|
||||||
lvgl::toolbar_create(parent, app);
|
lvgl::toolbar_create(parent, app);
|
||||||
|
|
||||||
|
|||||||
@ -166,6 +166,7 @@ class CalculatorApp : public App {
|
|||||||
void onShow(AppContext& context, lv_obj_t* parent) override {
|
void onShow(AppContext& context, lv_obj_t* parent) override {
|
||||||
lv_obj_remove_flag(parent, LV_OBJ_FLAG_SCROLLABLE);
|
lv_obj_remove_flag(parent, LV_OBJ_FLAG_SCROLLABLE);
|
||||||
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
|
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
|
||||||
|
lv_obj_set_style_pad_row(parent, 0, LV_STATE_DEFAULT);
|
||||||
|
|
||||||
lv_obj_t* toolbar = tt::lvgl::toolbar_create(parent, context);
|
lv_obj_t* toolbar = tt::lvgl::toolbar_create(parent, context);
|
||||||
lv_obj_align(toolbar, LV_ALIGN_TOP_MID, 0, 0);
|
lv_obj_align(toolbar, LV_ALIGN_TOP_MID, 0, 0);
|
||||||
|
|||||||
@ -91,6 +91,7 @@ public:
|
|||||||
|
|
||||||
void onShow(AppContext& app, lv_obj_t* parent) override {
|
void onShow(AppContext& app, lv_obj_t* parent) override {
|
||||||
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
|
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
|
||||||
|
lv_obj_set_style_pad_row(parent, 0, LV_STATE_DEFAULT);
|
||||||
|
|
||||||
// Toolbar
|
// Toolbar
|
||||||
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
|
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
|
||||||
|
|||||||
@ -67,6 +67,7 @@ public:
|
|||||||
displaySettings = settings::display::loadOrGetDefault();
|
displaySettings = settings::display::loadOrGetDefault();
|
||||||
|
|
||||||
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
|
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
|
||||||
|
lv_obj_set_style_pad_row(parent, 0, LV_STATE_DEFAULT);
|
||||||
|
|
||||||
auto hal_display = getHalDisplay();
|
auto hal_display = getHalDisplay();
|
||||||
assert(hal_display != nullptr);
|
assert(hal_display != nullptr);
|
||||||
|
|||||||
@ -253,6 +253,7 @@ void View::update() {
|
|||||||
|
|
||||||
void View::init(lv_obj_t* parent) {
|
void View::init(lv_obj_t* parent) {
|
||||||
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
|
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
|
||||||
|
lv_obj_set_style_pad_row(parent, 0, LV_STATE_DEFAULT);
|
||||||
|
|
||||||
auto* toolbar = lvgl::toolbar_create(parent, "Files");
|
auto* toolbar = lvgl::toolbar_create(parent, "Files");
|
||||||
navigate_up_button = lvgl::toolbar_add_button_action(toolbar, LV_SYMBOL_UP, &onNavigateUpPressedCallback, this);
|
navigate_up_button = lvgl::toolbar_add_button_action(toolbar, LV_SYMBOL_UP, &onNavigateUpPressedCallback, this);
|
||||||
|
|||||||
@ -175,6 +175,7 @@ void View::update() {
|
|||||||
|
|
||||||
void View::init(lv_obj_t* parent, Mode mode) {
|
void View::init(lv_obj_t* parent, Mode mode) {
|
||||||
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
|
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
|
||||||
|
lv_obj_set_style_pad_row(parent, 0, LV_STATE_DEFAULT);
|
||||||
|
|
||||||
auto* toolbar = lvgl::toolbar_create(parent, "Select File");
|
auto* toolbar = lvgl::toolbar_create(parent, "Select File");
|
||||||
navigate_up_button = lvgl::toolbar_add_button_action(toolbar, LV_SYMBOL_UP, &onNavigateUpPressedCallback, this);
|
navigate_up_button = lvgl::toolbar_add_button_action(toolbar, LV_SYMBOL_UP, &onNavigateUpPressedCallback, this);
|
||||||
|
|||||||
@ -104,6 +104,7 @@ void GpioApp::stopTask() {
|
|||||||
|
|
||||||
void GpioApp::onShow(AppContext& app, lv_obj_t* parent) {
|
void GpioApp::onShow(AppContext& app, lv_obj_t* parent) {
|
||||||
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
|
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
|
||||||
|
lv_obj_set_style_pad_row(parent, 0, LV_STATE_DEFAULT);
|
||||||
auto* toolbar = lvgl::toolbar_create(parent, app);
|
auto* toolbar = lvgl::toolbar_create(parent, app);
|
||||||
lv_obj_align(toolbar, LV_ALIGN_TOP_MID, 0, 0);
|
lv_obj_align(toolbar, LV_ALIGN_TOP_MID, 0, 0);
|
||||||
|
|
||||||
|
|||||||
@ -276,6 +276,7 @@ public:
|
|||||||
|
|
||||||
void onShow(AppContext& app, lv_obj_t* parent) final {
|
void onShow(AppContext& app, lv_obj_t* parent) final {
|
||||||
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
|
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
|
||||||
|
lv_obj_set_style_pad_row(parent, 0, LV_STATE_DEFAULT);
|
||||||
|
|
||||||
auto* toolbar = lvgl::toolbar_create(parent, app);
|
auto* toolbar = lvgl::toolbar_create(parent, app);
|
||||||
|
|
||||||
|
|||||||
@ -95,6 +95,7 @@ int32_t I2cScannerApp::getLastBusIndex() {
|
|||||||
|
|
||||||
void I2cScannerApp::onShow(AppContext& app, lv_obj_t* parent) {
|
void I2cScannerApp::onShow(AppContext& app, lv_obj_t* parent) {
|
||||||
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
|
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
|
||||||
|
lv_obj_set_style_pad_row(parent, 0, LV_STATE_DEFAULT);
|
||||||
|
|
||||||
lvgl::toolbar_create(parent, app);
|
lvgl::toolbar_create(parent, app);
|
||||||
|
|
||||||
|
|||||||
@ -75,6 +75,7 @@ class I2cSettingsApp : public App {
|
|||||||
|
|
||||||
void onShow(AppContext& app, lv_obj_t* parent) override {
|
void onShow(AppContext& app, lv_obj_t* parent) override {
|
||||||
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
|
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
|
||||||
|
lv_obj_set_style_pad_row(parent, 0, LV_STATE_DEFAULT);
|
||||||
lvgl::toolbar_create(parent, app);
|
lvgl::toolbar_create(parent, app);
|
||||||
|
|
||||||
auto* wrapper = lv_obj_create(parent);
|
auto* wrapper = lv_obj_create(parent);
|
||||||
|
|||||||
@ -85,6 +85,7 @@ public:
|
|||||||
textResources.load();
|
textResources.load();
|
||||||
|
|
||||||
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
|
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
|
||||||
|
lv_obj_set_style_pad_row(parent, 0, LV_STATE_DEFAULT);
|
||||||
|
|
||||||
lvgl::toolbar_create(parent, app);
|
lvgl::toolbar_create(parent, app);
|
||||||
|
|
||||||
|
|||||||
@ -74,6 +74,8 @@ public:
|
|||||||
|
|
||||||
void onShow(AppContext& app, lv_obj_t* parent) override {
|
void onShow(AppContext& app, lv_obj_t* parent) override {
|
||||||
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
|
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
|
||||||
|
lv_obj_set_style_pad_row(parent, 0, LV_STATE_DEFAULT);
|
||||||
|
|
||||||
auto* toolbar = lvgl::toolbar_create(parent, app);
|
auto* toolbar = lvgl::toolbar_create(parent, app);
|
||||||
lvgl::toolbar_add_button_action(toolbar, LV_SYMBOL_EDIT, onLevelFilterPressedCallback, this);
|
lvgl::toolbar_add_button_action(toolbar, LV_SYMBOL_EDIT, onLevelFilterPressedCallback, this);
|
||||||
|
|
||||||
|
|||||||
@ -123,6 +123,7 @@ class NotesApp : public App {
|
|||||||
void onShow(AppContext& context, lv_obj_t* parent) override {
|
void onShow(AppContext& context, lv_obj_t* parent) override {
|
||||||
lv_obj_remove_flag(parent, LV_OBJ_FLAG_SCROLLABLE);
|
lv_obj_remove_flag(parent, LV_OBJ_FLAG_SCROLLABLE);
|
||||||
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
|
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
|
||||||
|
lv_obj_set_style_pad_row(parent, 0, LV_STATE_DEFAULT);
|
||||||
|
|
||||||
lv_obj_t* toolbar = lvgl::toolbar_create(parent, context);
|
lv_obj_t* toolbar = lvgl::toolbar_create(parent, context);
|
||||||
lv_obj_align(toolbar, LV_ALIGN_TOP_MID, 0, 0);
|
lv_obj_align(toolbar, LV_ALIGN_TOP_MID, 0, 0);
|
||||||
|
|||||||
@ -144,6 +144,7 @@ public:
|
|||||||
|
|
||||||
void onShow(AppContext& app, lv_obj_t* parent) override {
|
void onShow(AppContext& app, lv_obj_t* parent) override {
|
||||||
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
|
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
|
||||||
|
lv_obj_set_style_pad_row(parent, 0, LV_STATE_DEFAULT);
|
||||||
|
|
||||||
lvgl::toolbar_create(parent, app);
|
lvgl::toolbar_create(parent, app);
|
||||||
|
|
||||||
|
|||||||
@ -255,6 +255,8 @@ void ScreenshotApp::onShow(AppContext& appContext, lv_obj_t* parent) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
|
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
|
||||||
|
lv_obj_set_style_pad_row(parent, 0, LV_STATE_DEFAULT);
|
||||||
|
|
||||||
auto* toolbar = lvgl::toolbar_create(parent, appContext);
|
auto* toolbar = lvgl::toolbar_create(parent, appContext);
|
||||||
lv_obj_align(toolbar, LV_ALIGN_TOP_MID, 0, 0);
|
lv_obj_align(toolbar, LV_ALIGN_TOP_MID, 0, 0);
|
||||||
|
|
||||||
|
|||||||
@ -73,6 +73,8 @@ public:
|
|||||||
|
|
||||||
void onShow(AppContext& app, lv_obj_t* parent) override {
|
void onShow(AppContext& app, lv_obj_t* parent) override {
|
||||||
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
|
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
|
||||||
|
lv_obj_set_style_pad_row(parent, 0, LV_STATE_DEFAULT);
|
||||||
|
|
||||||
std::string title = getTitleParameter(app.getParameters());
|
std::string title = getTitleParameter(app.getParameters());
|
||||||
lvgl::toolbar_create(parent, title);
|
lvgl::toolbar_create(parent, title);
|
||||||
|
|
||||||
|
|||||||
@ -61,6 +61,8 @@ public:
|
|||||||
|
|
||||||
void onShow(AppContext& app, lv_obj_t* parent) final {
|
void onShow(AppContext& app, lv_obj_t* parent) final {
|
||||||
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
|
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
|
||||||
|
lv_obj_set_style_pad_row(parent, 0, LV_STATE_DEFAULT);
|
||||||
|
|
||||||
auto* toolbar = lvgl::toolbar_create(parent, app);
|
auto* toolbar = lvgl::toolbar_create(parent, app);
|
||||||
|
|
||||||
disconnectButton = lvgl::toolbar_add_button_action(toolbar, LV_SYMBOL_POWER, onDisconnectPressed, this);
|
disconnectButton = lvgl::toolbar_add_button_action(toolbar, LV_SYMBOL_POWER, onDisconnectPressed, this);
|
||||||
|
|||||||
@ -27,6 +27,7 @@ class SettingsApp : public App {
|
|||||||
|
|
||||||
void onShow(AppContext& app, lv_obj_t* parent) override {
|
void onShow(AppContext& app, lv_obj_t* parent) override {
|
||||||
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
|
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
|
||||||
|
lv_obj_set_style_pad_row(parent, 0, LV_STATE_DEFAULT);
|
||||||
|
|
||||||
lvgl::toolbar_create(parent, app);
|
lvgl::toolbar_create(parent, app);
|
||||||
|
|
||||||
|
|||||||
@ -26,6 +26,7 @@ public:
|
|||||||
|
|
||||||
void onShow(AppContext& app, lv_obj_t* parent) override {
|
void onShow(AppContext& app, lv_obj_t* parent) override {
|
||||||
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
|
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
|
||||||
|
lv_obj_set_style_pad_row(parent, 0, LV_STATE_DEFAULT);
|
||||||
|
|
||||||
lvgl::toolbar_create(parent, app);
|
lvgl::toolbar_create(parent, app);
|
||||||
|
|
||||||
|
|||||||
@ -193,6 +193,8 @@ public:
|
|||||||
|
|
||||||
void onShow(AppContext& app, lv_obj_t* parent) override {
|
void onShow(AppContext& app, lv_obj_t* parent) override {
|
||||||
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
|
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
|
||||||
|
lv_obj_set_style_pad_row(parent, 0, LV_STATE_DEFAULT);
|
||||||
|
|
||||||
lvgl::toolbar_create(parent, app);
|
lvgl::toolbar_create(parent, app);
|
||||||
|
|
||||||
auto* search_wrapper = lv_obj_create(parent);
|
auto* search_wrapper = lv_obj_create(parent);
|
||||||
|
|||||||
@ -64,6 +64,8 @@ class WifiApSettings : public App {
|
|||||||
std::string ssid = paremeters->getString("ssid");
|
std::string ssid = paremeters->getString("ssid");
|
||||||
|
|
||||||
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
|
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
|
||||||
|
lv_obj_set_style_pad_row(parent, 0, LV_STATE_DEFAULT);
|
||||||
|
|
||||||
lvgl::toolbar_create(parent, ssid);
|
lvgl::toolbar_create(parent, ssid);
|
||||||
|
|
||||||
// Wrappers
|
// Wrappers
|
||||||
|
|||||||
@ -109,8 +109,9 @@ void View::createBottomButtons(lv_obj_t* parent) {
|
|||||||
|
|
||||||
// TODO: Standardize dialogs
|
// TODO: Standardize dialogs
|
||||||
void View::init(AppContext& app, lv_obj_t* parent) {
|
void View::init(AppContext& app, lv_obj_t* parent) {
|
||||||
|
|
||||||
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
|
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
|
||||||
|
lv_obj_set_style_pad_row(parent, 0, LV_STATE_DEFAULT);
|
||||||
|
|
||||||
lvgl::toolbar_create(parent, app);
|
lvgl::toolbar_create(parent, app);
|
||||||
|
|
||||||
auto* wrapper = lv_obj_create(parent);
|
auto* wrapper = lv_obj_create(parent);
|
||||||
|
|||||||
@ -272,12 +272,15 @@ void View::updateEnableOnBootToggle() {
|
|||||||
// region Main
|
// region Main
|
||||||
|
|
||||||
void View::init(const AppContext& app, lv_obj_t* parent) {
|
void View::init(const AppContext& app, lv_obj_t* parent) {
|
||||||
|
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
|
||||||
|
lv_obj_set_style_pad_row(parent, 0, LV_STATE_DEFAULT);
|
||||||
|
|
||||||
root = parent;
|
root = parent;
|
||||||
|
|
||||||
paths = app.getPaths();
|
paths = app.getPaths();
|
||||||
|
|
||||||
// Toolbar
|
// Toolbar
|
||||||
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
|
|
||||||
lv_obj_t* toolbar = lvgl::toolbar_create(parent, app);
|
lv_obj_t* toolbar = lvgl::toolbar_create(parent, app);
|
||||||
|
|
||||||
scanning_spinner = lvgl::toolbar_add_spinner_action(toolbar);
|
scanning_spinner = lvgl::toolbar_add_spinner_action(toolbar);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user