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
a2db424e
Unverified
Commit
a2db424e
authored
Jan 26, 2018
by
Gabor Kiss-Vamosi
Committed by
GitHub
Jan 26, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #86 from upbeat27/tabview-spelling-fix
Tabview spelling fix
parents
bff582d5
8bc98687
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
12 deletions
+12
-12
lv_tabview.c
lv_objx/lv_tabview.c
+12
-12
No files found.
lv_objx/lv_tabview.c
View file @
a2db424e
...
...
@@ -37,9 +37,9 @@ static lv_res_t lv_tabview_signal(lv_obj_t * tabview, lv_signal_t sign, void * p
static
lv_res_t
tabpage_signal
(
lv_obj_t
*
tab_page
,
lv_signal_t
sign
,
void
*
param
);
static
lv_res_t
tabpage_scrl_signal
(
lv_obj_t
*
tab_scrl
,
lv_signal_t
sign
,
void
*
param
);
static
void
tabpage_pressed_hadler
(
lv_obj_t
*
tabview
,
lv_obj_t
*
tabpage
);
static
void
tabpage_pressing_hadler
(
lv_obj_t
*
tabview
,
lv_obj_t
*
tabpage
);
static
void
tabpage_press_lost_hadler
(
lv_obj_t
*
tabview
,
lv_obj_t
*
tabpage
);
static
void
tabpage_pressed_ha
n
dler
(
lv_obj_t
*
tabview
,
lv_obj_t
*
tabpage
);
static
void
tabpage_pressing_ha
n
dler
(
lv_obj_t
*
tabview
,
lv_obj_t
*
tabpage
);
static
void
tabpage_press_lost_ha
n
dler
(
lv_obj_t
*
tabview
,
lv_obj_t
*
tabpage
);
static
lv_res_t
tab_btnm_action
(
lv_obj_t
*
tab_btnm
,
const
char
*
tab_name
);
static
void
tabview_realign
(
lv_obj_t
*
tabview
);
...
...
@@ -542,13 +542,13 @@ static lv_res_t tabpage_signal(lv_obj_t * tab_page, lv_signal_t sign, void * par
if
(
lv_tabview_get_sliding
(
tabview
)
==
false
)
return
res
;
if
(
sign
==
LV_SIGNAL_PRESSED
)
{
tabpage_pressed_hadler
(
tabview
,
tab_page
);
tabpage_pressed_ha
n
dler
(
tabview
,
tab_page
);
}
else
if
(
sign
==
LV_SIGNAL_PRESSING
)
{
tabpage_pressing_hadler
(
tabview
,
tab_page
);
tabpage_pressing_ha
n
dler
(
tabview
,
tab_page
);
}
else
if
(
sign
==
LV_SIGNAL_RELEASED
||
sign
==
LV_SIGNAL_PRESS_LOST
)
{
tabpage_press_lost_hadler
(
tabview
,
tab_page
);
tabpage_press_lost_ha
n
dler
(
tabview
,
tab_page
);
}
return
res
;
...
...
@@ -575,13 +575,13 @@ static lv_res_t tabpage_scrl_signal(lv_obj_t * tab_scrl, lv_signal_t sign, void
if
(
lv_tabview_get_sliding
(
tabview
)
==
false
)
return
res
;
if
(
sign
==
LV_SIGNAL_PRESSED
)
{
tabpage_pressed_hadler
(
tabview
,
tab_page
);
tabpage_pressed_ha
n
dler
(
tabview
,
tab_page
);
}
else
if
(
sign
==
LV_SIGNAL_PRESSING
)
{
tabpage_pressing_hadler
(
tabview
,
tab_page
);
tabpage_pressing_ha
n
dler
(
tabview
,
tab_page
);
}
else
if
(
sign
==
LV_SIGNAL_RELEASED
||
sign
==
LV_SIGNAL_PRESS_LOST
)
{
tabpage_press_lost_hadler
(
tabview
,
tab_page
);
tabpage_press_lost_ha
n
dler
(
tabview
,
tab_page
);
}
return
res
;
...
...
@@ -592,7 +592,7 @@ static lv_res_t tabpage_scrl_signal(lv_obj_t * tab_scrl, lv_signal_t sign, void
* @param tabview pointer to the btn view object
* @param tabpage pointer to the page of a btn
*/
static
void
tabpage_pressed_hadler
(
lv_obj_t
*
tabview
,
lv_obj_t
*
tabpage
)
static
void
tabpage_pressed_ha
n
dler
(
lv_obj_t
*
tabview
,
lv_obj_t
*
tabpage
)
{
(
void
)
tabpage
;
...
...
@@ -606,7 +606,7 @@ static void tabpage_pressed_hadler(lv_obj_t * tabview, lv_obj_t * tabpage)
* @param tabview pointer to the btn view object
* @param tabpage pointer to the page of a btn
*/
static
void
tabpage_pressing_hadler
(
lv_obj_t
*
tabview
,
lv_obj_t
*
tabpage
)
static
void
tabpage_pressing_ha
n
dler
(
lv_obj_t
*
tabview
,
lv_obj_t
*
tabpage
)
{
lv_tabview_ext_t
*
ext
=
lv_obj_get_ext_attr
(
tabview
);
lv_indev_t
*
indev
=
lv_indev_get_act
();
...
...
@@ -645,7 +645,7 @@ static void tabpage_pressing_hadler(lv_obj_t * tabview, lv_obj_t * tabpage)
* @param tabview pointer to the btn view object
* @param tabpage pointer to the page of a btn
*/
static
void
tabpage_press_lost_hadler
(
lv_obj_t
*
tabview
,
lv_obj_t
*
tabpage
)
static
void
tabpage_press_lost_ha
n
dler
(
lv_obj_t
*
tabview
,
lv_obj_t
*
tabpage
)
{
lv_tabview_ext_t
*
ext
=
lv_obj_get_ext_attr
(
tabview
);
ext
->
drag_hor
=
0
;
...
...
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