Merge develop into main (#338)
### Cardputer: - Fix keyboard issue with up/down button conflict when selecting switch - Fix backlight flickering ### UI improvements - Removed a 3 pixel border that went around the entire desktop environment - Improved system layout (GuiService) - Statusbar: improved layout (mainly margin/padding) - Toolbar: fixed margin/padding of all buttons, fixed alignment of all content - Improved layout/UI of many apps ### Other - Update LVGL to 9.3.0 official release (was dev version)
This commit is contained in:
committed by
GitHub
parent
53b711584f
commit
a2af95b92d
@@ -1,8 +1,8 @@
|
||||
#include "Tactility/app/selectiondialog/SelectionDialog.h"
|
||||
#include "Tactility/lvgl/Style.h"
|
||||
#include "Tactility/lvgl/Toolbar.h"
|
||||
#include "Tactility/lvgl/LvglSync.h"
|
||||
#include "Tactility/service/loader/Loader.h"
|
||||
#include <Tactility/app/selectiondialog/SelectionDialog.h>
|
||||
#include <Tactility/lvgl/Style.h>
|
||||
#include <Tactility/lvgl/Toolbar.h>
|
||||
#include <Tactility/lvgl/LvglSync.h>
|
||||
#include <Tactility/service/loader/Loader.h>
|
||||
|
||||
#include <sstream>
|
||||
#include <vector>
|
||||
@@ -10,18 +10,16 @@
|
||||
|
||||
#include <lvgl.h>
|
||||
|
||||
#define TAG "text_viewer"
|
||||
|
||||
namespace tt::app::log {
|
||||
|
||||
class LogApp : public App {
|
||||
|
||||
private:
|
||||
static constexpr auto* TAG = "LogApp";
|
||||
|
||||
LogLevel filterLevel = LogLevel::Info;
|
||||
lv_obj_t* labelWidget = nullptr;
|
||||
|
||||
static inline bool shouldShowLog(LogLevel filterLevel, LogLevel logLevel) {
|
||||
static bool shouldShowLog(LogLevel filterLevel, LogLevel logLevel) {
|
||||
return filterLevel >= logLevel;
|
||||
}
|
||||
|
||||
@@ -67,7 +65,8 @@ private:
|
||||
"Warning",
|
||||
"Error",
|
||||
};
|
||||
app::selectiondialog::start("Log Level", items);
|
||||
|
||||
selectiondialog::start("Log Level", items);
|
||||
}
|
||||
|
||||
public:
|
||||
|
||||
Reference in New Issue
Block a user