mirror of
https://github.com/eez-open/eez-flow-template-stm32f469i-disco.git
synced 2026-11-17 04:48:55 +01:00
update eez-framework
This commit is contained in:
parent
3e00150e34
commit
c87c101002
@ -1 +1 @@
|
|||||||
Subproject commit 1d2b26104c80c2ed0bc100b9f2f67f254a7d561f
|
Subproject commit 70ddce6d411ec7c82ca3f42dfcc14e70cb97dcc7
|
||||||
File diff suppressed because one or more lines are too long
16251
Src/gui/document.cpp
16251
Src/gui/document.cpp
File diff suppressed because it is too large
Load Diff
@ -93,8 +93,8 @@ enum FontsEnum {
|
|||||||
FONT_ID_SHADOW = 2,
|
FONT_ID_SHADOW = 2,
|
||||||
FONT_ID_TEXT_M = 3,
|
FONT_ID_TEXT_M = 3,
|
||||||
FONT_ID_TEXT_L = 4,
|
FONT_ID_TEXT_L = 4,
|
||||||
FONT_ID_TEXT_XL = 5,
|
FONT_ID_TEXT_XXL = 5,
|
||||||
FONT_ID_TEXT_XXL = 6
|
FONT_ID_TEXT_XL = 6
|
||||||
};
|
};
|
||||||
|
|
||||||
enum BitmapsEnum {
|
enum BitmapsEnum {
|
||||||
@ -102,7 +102,31 @@ enum BitmapsEnum {
|
|||||||
};
|
};
|
||||||
|
|
||||||
enum StylesEnum {
|
enum StylesEnum {
|
||||||
STYLE_ID_NONE = 0
|
STYLE_ID_NONE = 0,
|
||||||
|
STYLE_ID_DEFAULT = 1,
|
||||||
|
STYLE_ID_INFO_ALERT = 2,
|
||||||
|
STYLE_ID_ERROR_ALERT = 3,
|
||||||
|
STYLE_ID_ERROR_ALERT_BUTTON = 4,
|
||||||
|
STYLE_ID_SELECT_ENUM_ITEM_POPUP_CONTAINER = 5,
|
||||||
|
STYLE_ID_SELECT_ENUM_ITEM_POPUP_CONTAINER_S = 6,
|
||||||
|
STYLE_ID_SELECT_ENUM_ITEM_POPUP_ITEM = 7,
|
||||||
|
STYLE_ID_SELECT_ENUM_ITEM_POPUP_ITEM_S = 8,
|
||||||
|
STYLE_ID_SELECT_ENUM_ITEM_POPUP_DISABLED_ITEM = 9,
|
||||||
|
STYLE_ID_SELECT_ENUM_ITEM_POPUP_DISABLED_ITEM_S = 10,
|
||||||
|
STYLE_ID_MENU_WITH_BUTTONS_MESSAGE = 11,
|
||||||
|
STYLE_ID_MENU_WITH_BUTTONS_CONTAINER = 12,
|
||||||
|
STYLE_ID_MENU_WITH_BUTTONS_BUTTON = 13,
|
||||||
|
STYLE_ID_FPS_GRAPH = 14,
|
||||||
|
STYLE_ID_SLIDER_WIDGET = 15,
|
||||||
|
STYLE_ID_SWITCH_WIDGET = 16,
|
||||||
|
STYLE_ID_BACKGROUND = 17,
|
||||||
|
STYLE_ID_BUTTON = 18,
|
||||||
|
STYLE_ID_BUTTON_DISABLED = 19,
|
||||||
|
STYLE_ID_NOTE_M = 20,
|
||||||
|
STYLE_ID_DROP_DOWN_LIST = 21,
|
||||||
|
STYLE_ID_ROLLER_WIDGET = 22,
|
||||||
|
STYLE_ID_ROLLER_WIDGET_SELECTED_VALUE = 23,
|
||||||
|
STYLE_ID_ROLLER_WIDGET_UNSELECTED_VALUE = 24
|
||||||
};
|
};
|
||||||
|
|
||||||
enum ThemesEnum {
|
enum ThemesEnum {
|
||||||
@ -145,7 +169,9 @@ enum ColorsEnum {
|
|||||||
COLOR_ID_TEXT_INPUT_BORDER = 31,
|
COLOR_ID_TEXT_INPUT_BORDER = 31,
|
||||||
COLOR_ID_CUSTOM_UNDEFINED = 32,
|
COLOR_ID_CUSTOM_UNDEFINED = 32,
|
||||||
COLOR_ID_CUSTOM_000000 = 33,
|
COLOR_ID_CUSTOM_000000 = 33,
|
||||||
COLOR_ID_CUSTOM_00FF1E = 34
|
COLOR_ID_CUSTOM_00FF1E = 34,
|
||||||
|
COLOR_ID_CUSTOM_C0C0C0 = 35,
|
||||||
|
COLOR_ID_CUSTOM_808080 = 36
|
||||||
};
|
};
|
||||||
|
|
||||||
enum PagesEnum {
|
enum PagesEnum {
|
||||||
@ -155,7 +181,7 @@ enum PagesEnum {
|
|||||||
PAGE_ID_KEYBOARD = 3
|
PAGE_ID_KEYBOARD = 3
|
||||||
};
|
};
|
||||||
|
|
||||||
extern const uint8_t assets[59009];
|
extern const uint8_t assets[59082];
|
||||||
|
|
||||||
#elif defined(EEZ_PLATFORM_SIMULATOR)
|
#elif defined(EEZ_PLATFORM_SIMULATOR)
|
||||||
|
|
||||||
@ -246,8 +272,8 @@ enum FontsEnum {
|
|||||||
FONT_ID_SHADOW = 2,
|
FONT_ID_SHADOW = 2,
|
||||||
FONT_ID_TEXT_M = 3,
|
FONT_ID_TEXT_M = 3,
|
||||||
FONT_ID_TEXT_L = 4,
|
FONT_ID_TEXT_L = 4,
|
||||||
FONT_ID_TEXT_XL = 5,
|
FONT_ID_TEXT_XXL = 5,
|
||||||
FONT_ID_TEXT_XXL = 6
|
FONT_ID_TEXT_XL = 6
|
||||||
};
|
};
|
||||||
|
|
||||||
enum BitmapsEnum {
|
enum BitmapsEnum {
|
||||||
@ -256,7 +282,31 @@ enum BitmapsEnum {
|
|||||||
};
|
};
|
||||||
|
|
||||||
enum StylesEnum {
|
enum StylesEnum {
|
||||||
STYLE_ID_NONE = 0
|
STYLE_ID_NONE = 0,
|
||||||
|
STYLE_ID_DEFAULT = 1,
|
||||||
|
STYLE_ID_INFO_ALERT = 2,
|
||||||
|
STYLE_ID_ERROR_ALERT = 3,
|
||||||
|
STYLE_ID_ERROR_ALERT_BUTTON = 4,
|
||||||
|
STYLE_ID_SELECT_ENUM_ITEM_POPUP_CONTAINER = 5,
|
||||||
|
STYLE_ID_SELECT_ENUM_ITEM_POPUP_CONTAINER_S = 6,
|
||||||
|
STYLE_ID_SELECT_ENUM_ITEM_POPUP_ITEM = 7,
|
||||||
|
STYLE_ID_SELECT_ENUM_ITEM_POPUP_ITEM_S = 8,
|
||||||
|
STYLE_ID_SELECT_ENUM_ITEM_POPUP_DISABLED_ITEM = 9,
|
||||||
|
STYLE_ID_SELECT_ENUM_ITEM_POPUP_DISABLED_ITEM_S = 10,
|
||||||
|
STYLE_ID_MENU_WITH_BUTTONS_MESSAGE = 11,
|
||||||
|
STYLE_ID_MENU_WITH_BUTTONS_CONTAINER = 12,
|
||||||
|
STYLE_ID_MENU_WITH_BUTTONS_BUTTON = 13,
|
||||||
|
STYLE_ID_FPS_GRAPH = 14,
|
||||||
|
STYLE_ID_SLIDER_WIDGET = 15,
|
||||||
|
STYLE_ID_SWITCH_WIDGET = 16,
|
||||||
|
STYLE_ID_BACKGROUND = 17,
|
||||||
|
STYLE_ID_BUTTON = 18,
|
||||||
|
STYLE_ID_BUTTON_DISABLED = 19,
|
||||||
|
STYLE_ID_NOTE_M = 20,
|
||||||
|
STYLE_ID_DROP_DOWN_LIST = 21,
|
||||||
|
STYLE_ID_ROLLER_WIDGET = 22,
|
||||||
|
STYLE_ID_ROLLER_WIDGET_SELECTED_VALUE = 23,
|
||||||
|
STYLE_ID_ROLLER_WIDGET_UNSELECTED_VALUE = 24
|
||||||
};
|
};
|
||||||
|
|
||||||
enum ThemesEnum {
|
enum ThemesEnum {
|
||||||
@ -300,7 +350,9 @@ enum ColorsEnum {
|
|||||||
COLOR_ID_CUSTOM_UNDEFINED = 32,
|
COLOR_ID_CUSTOM_UNDEFINED = 32,
|
||||||
COLOR_ID_CUSTOM_000000 = 33,
|
COLOR_ID_CUSTOM_000000 = 33,
|
||||||
COLOR_ID_CUSTOM_00FF1E = 34,
|
COLOR_ID_CUSTOM_00FF1E = 34,
|
||||||
COLOR_ID_CUSTOM_FFFFFF = 35
|
COLOR_ID_CUSTOM_C0C0C0 = 35,
|
||||||
|
COLOR_ID_CUSTOM_808080 = 36,
|
||||||
|
COLOR_ID_CUSTOM_FFFFFF = 37
|
||||||
};
|
};
|
||||||
|
|
||||||
enum PagesEnum {
|
enum PagesEnum {
|
||||||
@ -311,7 +363,7 @@ enum PagesEnum {
|
|||||||
PAGE_ID_FRONT_PANEL = 4
|
PAGE_ID_FRONT_PANEL = 4
|
||||||
};
|
};
|
||||||
|
|
||||||
extern const uint8_t assets[75426];
|
extern const uint8_t assets[75482];
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user