BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
L
lvgl
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
lvgl
Commits
c72a1614
Commit
c72a1614
authored
May 01, 2017
by
Kiss-Vamosi Gabor
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lv_app style: minor updates
parent
082eb2da
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
8 deletions
+12
-8
lv_app.c
lv_app/lv_app.c
+9
-6
lv_app_sysmon.c
lv_appx/lv_app_sysmon.c
+1
-0
lv_app_terminal.c
lv_appx/lv_app_terminal.c
+2
-2
No files found.
lv_app/lv_app.c
View file @
c72a1614
...
@@ -1011,9 +1011,10 @@ static void lv_app_init_style(void)
...
@@ -1011,9 +1011,10 @@ static void lv_app_init_style(void)
/*Menu style*/
/*Menu style*/
lv_style_get
(
LV_STYLE_PLAIN
,
&
app_style
.
menu
);
lv_style_get
(
LV_STYLE_PLAIN
,
&
app_style
.
menu
);
app_style
.
menu
.
ccolor
=
COLOR_WHITE
;
app_style
.
menu
.
ccolor
=
COLOR_WHITE
;
app_style
.
menu
.
mcolor
=
COLOR_BLACK
;
app_style
.
menu
.
mcolor
=
COLOR_MAKE
(
0x30
,
0x30
,
0x30
);
app_style
.
menu
.
gcolor
=
COLOR_BLACK
;
app_style
.
menu
.
gcolor
=
COLOR_MAKE
(
0x30
,
0x30
,
0x30
);
app_style
.
menu
.
opa
=
OPA_80
;
app_style
.
menu
.
bcolor
=
COLOR_MAKE
(
0x80
,
0x80
,
0x80
);
app_style
.
menu
.
opa
=
OPA_COVER
;
app_style
.
menu
.
radius
=
0
;
app_style
.
menu
.
radius
=
0
;
app_style
.
menu
.
bwidth
=
0
;
app_style
.
menu
.
bwidth
=
0
;
app_style
.
menu
.
swidth
=
0
;
app_style
.
menu
.
swidth
=
0
;
...
@@ -1022,9 +1023,10 @@ static void lv_app_init_style(void)
...
@@ -1022,9 +1023,10 @@ static void lv_app_init_style(void)
app_style
.
menu
.
opad
=
LV_DPI
/
12
;
app_style
.
menu
.
opad
=
LV_DPI
/
12
;
lv_style_get
(
LV_STYLE_BTN_REL
,
&
app_style
.
menu_btn_rel
);
lv_style_get
(
LV_STYLE_BTN_REL
,
&
app_style
.
menu_btn_rel
);
app_style
.
menu_btn_rel
.
ccolor
=
COLOR_MAKE
(
0xd0
,
0xe0
,
0xf0
);
app_style
.
menu_btn_rel
.
ccolor
=
COLOR_WHITE
;
app_style
.
menu_btn_rel
.
mcolor
=
COLOR_BLACK
;
app_style
.
menu_btn_rel
.
mcolor
=
COLOR_MAKE
(
0x30
,
0x30
,
0x30
);
app_style
.
menu_btn_rel
.
gcolor
=
COLOR_BLACK
;
app_style
.
menu_btn_rel
.
gcolor
=
COLOR_MAKE
(
0x30
,
0x30
,
0x30
);
app_style
.
menu_btn_rel
.
bcolor
=
COLOR_MAKE
(
0x80
,
0x80
,
0x80
);
app_style
.
menu_btn_rel
.
bwidth
=
0
;
app_style
.
menu_btn_rel
.
bwidth
=
0
;
app_style
.
menu_btn_rel
.
radius
=
0
;
app_style
.
menu_btn_rel
.
radius
=
0
;
app_style
.
menu_btn_rel
.
swidth
=
0
;
app_style
.
menu_btn_rel
.
swidth
=
0
;
...
@@ -1038,6 +1040,7 @@ static void lv_app_init_style(void)
...
@@ -1038,6 +1040,7 @@ static void lv_app_init_style(void)
memcpy
(
&
app_style
.
menu_btn_pr
,
&
app_style
.
menu_btn_rel
,
sizeof
(
lv_style_t
));
memcpy
(
&
app_style
.
menu_btn_pr
,
&
app_style
.
menu_btn_rel
,
sizeof
(
lv_style_t
));
app_style
.
menu_btn_pr
.
mcolor
=
COLOR_GRAY
;
app_style
.
menu_btn_pr
.
mcolor
=
COLOR_GRAY
;
app_style
.
menu_btn_pr
.
gcolor
=
COLOR_GRAY
;
app_style
.
menu_btn_pr
.
gcolor
=
COLOR_GRAY
;
app_style
.
menu_btn_pr
.
bcolor
=
COLOR_GRAY
;
app_style
.
menu_btn_pr
.
bwidth
=
0
;
app_style
.
menu_btn_pr
.
bwidth
=
0
;
app_style
.
menu_btn_pr
.
radius
=
0
;
app_style
.
menu_btn_pr
.
radius
=
0
;
app_style
.
menu_btn_pr
.
empty
=
0
;
app_style
.
menu_btn_pr
.
empty
=
0
;
...
...
lv_appx/lv_app_sysmon.c
View file @
c72a1614
...
@@ -234,6 +234,7 @@ static void my_win_open(lv_app_inst_t * app, lv_obj_t * win)
...
@@ -234,6 +234,7 @@ static void my_win_open(lv_app_inst_t * app, lv_obj_t * win)
{
{
my_win_data_t
*
win_data
=
app
->
win_data
;
my_win_data_t
*
win_data
=
app
->
win_data
;
/*Make the window content responsive*/
lv_cont_set_layout
(
lv_page_get_scrl
(
lv_win_get_page
(
win
)),
LV_CONT_LAYOUT_PRETTY
);
lv_cont_set_layout
(
lv_page_get_scrl
(
lv_win_get_page
(
win
)),
LV_CONT_LAYOUT_PRETTY
);
/*Create a chart with two data lines*/
/*Create a chart with two data lines*/
...
...
lv_appx/lv_app_terminal.c
View file @
c72a1614
...
@@ -254,6 +254,7 @@ static void my_win_open(lv_app_inst_t * app, lv_obj_t * win)
...
@@ -254,6 +254,7 @@ static void my_win_open(lv_app_inst_t * app, lv_obj_t * win)
my_win_data_t
*
win_data
=
app
->
win_data
;
my_win_data_t
*
win_data
=
app
->
win_data
;
my_app_data_t
*
app_data
=
app
->
app_data
;
my_app_data_t
*
app_data
=
app
->
app_data
;
/*Make the window content responsive*/
lv_cont_set_layout
(
lv_page_get_scrl
(
lv_win_get_page
(
win
)),
LV_CONT_LAYOUT_PRETTY
);
lv_cont_set_layout
(
lv_page_get_scrl
(
lv_win_get_page
(
win
)),
LV_CONT_LAYOUT_PRETTY
);
/*Create a label for the text of the terminal*/
/*Create a label for the text of the terminal*/
...
@@ -264,7 +265,7 @@ static void my_win_open(lv_app_inst_t * app, lv_obj_t * win)
...
@@ -264,7 +265,7 @@ static void my_win_open(lv_app_inst_t * app, lv_obj_t * win)
/*Create a text area. Text can be added to the terminal from here by app. keyboard.*/
/*Create a text area. Text can be added to the terminal from here by app. keyboard.*/
win_data
->
ta
=
lv_ta_create
(
win
,
NULL
);
win_data
->
ta
=
lv_ta_create
(
win
,
NULL
);
lv_obj_set_size
(
win_data
->
ta
,
lv_win_get_width
(
win
)
,
LV_VER_RES
/
4
);
lv_obj_set_size
(
win_data
->
ta
,
3
*
LV_HOR_RES
/
5
,
LV_VER_RES
/
4
);
lv_obj_set_free_p
(
win_data
->
ta
,
app
);
lv_obj_set_free_p
(
win_data
->
ta
,
app
);
lv_page_set_rel_action
(
win_data
->
ta
,
win_ta_rel_action
);
lv_page_set_rel_action
(
win_data
->
ta
,
win_ta_rel_action
);
lv_page_glue_obj
(
win_data
->
ta
,
true
);
lv_page_glue_obj
(
win_data
->
ta
,
true
);
...
@@ -282,7 +283,6 @@ static void my_win_open(lv_app_inst_t * app, lv_obj_t * win)
...
@@ -282,7 +283,6 @@ static void my_win_open(lv_app_inst_t * app, lv_obj_t * win)
/*Align the window to see the text area on the bottom*/
/*Align the window to see the text area on the bottom*/
lv_obj_t
*
page
=
lv_win_get_page
(
app
->
win
);
lv_obj_t
*
page
=
lv_win_get_page
(
app
->
win
);
lv_obj_align
(
lv_page_get_scrl
(
page
),
NULL
,
LV_ALIGN_IN_BOTTOM_LEFT
,
0
,
-
LV_VER_RES
);
lv_obj_align
(
lv_page_get_scrl
(
page
),
NULL
,
LV_ALIGN_IN_BOTTOM_LEFT
,
0
,
-
LV_VER_RES
);
}
}
/**
/**
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment