Browse Source

update eez-framework

master
Martin Vladic 2 years ago
parent
commit
75b727ad97
  1. 2
      Middlewares/eez
  2. 2325
      Src/eez-flow-template-stm32f469i-disco.eez-project
  3. 16888
      Src/gui/document.cpp
  4. 44
      Src/gui/document.h

2
Middlewares/eez

@ -1 +1 @@
Subproject commit 6aaa013284b2712761200fffd02de09a4610e808
Subproject commit 96978d9d7a283ed76c9439fe52c769a17820e48e

2325
Src/eez-flow-template-stm32f469i-disco.eez-project

File diff suppressed because it is too large Load Diff

16888
Src/gui/document.cpp

File diff suppressed because it is too large Load Diff

44
Src/gui/document.h

@ -141,11 +141,11 @@ enum StylesEnum {
STYLE_ID_QUOTE = 33,
STYLE_ID_INLINE33 = 34,
STYLE_ID_INLINE34 = 35,
STYLE_ID_BLOCK = 36,
STYLE_ID_INLINE35 = 36,
STYLE_ID_INLINE36 = 37,
STYLE_ID_INLINE37 = 38,
STYLE_ID_LABEL_LEFT_ALIGNED = 39,
STYLE_ID_BUTTON_LARGE = 40
STYLE_ID_LABEL_LEFT_ALIGNED = 38,
STYLE_ID_BUTTON_LARGE = 39,
STYLE_ID_BLOCK = 40
};
enum ThemesEnum {
@ -196,9 +196,9 @@ enum ColorsEnum {
COLOR_ID_CUSTOM_00FF00 = 39,
COLOR_ID_CUSTOM_B9F3F0 = 40,
COLOR_ID_CUSTOM_EEE30F = 41,
COLOR_ID_CUSTOM_C8C8C8 = 42,
COLOR_ID_CUSTOM_C0C0C0 = 43,
COLOR_ID_CUSTOM_808080 = 44
COLOR_ID_CUSTOM_C0C0C0 = 42,
COLOR_ID_CUSTOM_808080 = 43,
COLOR_ID_CUSTOM_C8C8C8 = 44
};
enum PagesEnum {
@ -209,12 +209,12 @@ enum PagesEnum {
PAGE_ID_NUMERIC_KEYPAD = 4,
PAGE_ID_KEYBOARD = 5,
PAGE_ID_ANIM_DEMO = 6,
PAGE_ID_ANIM1 = 7,
PAGE_ID_INPUT_DEMO = 8,
PAGE_ID_ROLLER_INPUT_DEMO = 9
PAGE_ID_INPUT_DEMO = 7,
PAGE_ID_ROLLER_INPUT_DEMO = 8,
PAGE_ID_LOADER = 9
};
extern const uint8_t assets[68251];
extern const uint8_t assets[68232];
#elif defined(EEZ_PLATFORM_SIMULATOR)
@ -354,11 +354,11 @@ enum StylesEnum {
STYLE_ID_QUOTE = 33,
STYLE_ID_INLINE33 = 34,
STYLE_ID_INLINE34 = 35,
STYLE_ID_BLOCK = 36,
STYLE_ID_INLINE35 = 36,
STYLE_ID_INLINE36 = 37,
STYLE_ID_INLINE37 = 38,
STYLE_ID_LABEL_LEFT_ALIGNED = 39,
STYLE_ID_BUTTON_LARGE = 40,
STYLE_ID_LABEL_LEFT_ALIGNED = 38,
STYLE_ID_BUTTON_LARGE = 39,
STYLE_ID_BLOCK = 40,
STYLE_ID_INLINE40 = 41
};
@ -410,9 +410,9 @@ enum ColorsEnum {
COLOR_ID_CUSTOM_00FF00 = 39,
COLOR_ID_CUSTOM_B9F3F0 = 40,
COLOR_ID_CUSTOM_EEE30F = 41,
COLOR_ID_CUSTOM_C8C8C8 = 42,
COLOR_ID_CUSTOM_C0C0C0 = 43,
COLOR_ID_CUSTOM_808080 = 44
COLOR_ID_CUSTOM_C0C0C0 = 42,
COLOR_ID_CUSTOM_808080 = 43,
COLOR_ID_CUSTOM_C8C8C8 = 44
};
enum PagesEnum {
@ -423,13 +423,13 @@ enum PagesEnum {
PAGE_ID_NUMERIC_KEYPAD = 4,
PAGE_ID_KEYBOARD = 5,
PAGE_ID_ANIM_DEMO = 6,
PAGE_ID_ANIM1 = 7,
PAGE_ID_INPUT_DEMO = 8,
PAGE_ID_ROLLER_INPUT_DEMO = 9,
PAGE_ID_INPUT_DEMO = 7,
PAGE_ID_ROLLER_INPUT_DEMO = 8,
PAGE_ID_LOADER = 9,
PAGE_ID_FRONT_PANEL = 10
};
extern const uint8_t assets[84703];
extern const uint8_t assets[84687];
#endif

Loading…
Cancel
Save