Mirrors_UI_SDK/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2026-05-31 07:56:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1 from littlevgl/beta

Browse Source 
Beta
This commit is contained in:
upbeat27
2018-01-30 11:09:23 -08:00
committed by GitHub
parent 177af6cae7 ec19ceb22f
commit aad9f76a39
6 changed files with 36 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/TODO_MAJOR.md
+13
View File
@@ -4,6 +4,19 @@ Major versions released typically when API changes are required
## Contributing ## Contributing
Please create an issue to suggest a new feature instead of adding pull request to this file. Please create an issue to suggest a new feature instead of adding pull request to this file.
## v6 (released at: in progrss)
- [ ] Add the basic functions (e.g. lv_obj_set_width) to every object type as inline
- [ ] Image storage with header (#65)
- [ ] Font anti-alias: use 1 bit and grayscale fonts too (better result then downscaling)
- [ ] LV_ANTIALIAS_FONT removal (use other font instead)
- [ ] Store image anti-alias in header
- [ ] lv_img_upscale removal (generate image with anti-alias flag instead)
- [ ] LV_ANTIALIAS_LINE
- [ ] LV_ANTIALAIS_RADIUS
- [ ] LV_ANTIALIAS removal (use other specific anti-alias options)
- [ ] web based image converter
- [ ] web based font converter
## v5 (released at: 20.12.2017) ## v5 (released at: 20.12.2017)
**Architectural changes** **Architectural changes**
- [x] Rename repository from *proj_pc* to *pc_simulator* - [x] Rename repository from *proj_pc* to *pc_simulator*
lv_draw/lv_draw.c
+7 -3
View File
@@ -310,14 +310,18 @@ void lv_draw_label(const lv_area_t * coords,const lv_area_t * mask, const lv_sty
lv_color_t recolor; lv_color_t recolor;
lv_coord_t letter_w; lv_coord_t letter_w;
lv_coord_t x_ofs = 0;
lv_coord_t y_ofs = 0;
if(offset != NULL) { if(offset != NULL) {
pos.y += offset->y; x_ofs = offset->x << LV_ANTIALIAS << LV_FONT_ANTIALIAS;
y_ofs = offset->y << LV_ANTIALIAS << LV_FONT_ANTIALIAS;
pos.y += y_ofs;
} }
/*Write out all lines*/ /*Write out all lines*/
while(txt[line_start] != '\0') { while(txt[line_start] != '\0') {
if(offset != NULL) { if(offset != NULL) {
pos.x += offset->x; pos.x += x_ofs;
} }
/*Write all letter of a line*/ /*Write all letter of a line*/
cmd_state = CMD_STATE_WAIT; cmd_state = CMD_STATE_WAIT;
@@ -369,7 +373,7 @@ void lv_draw_label(const lv_area_t * coords,const lv_area_t * mask, const lv_sty
pos.x += letter_w + (style->text.letter_space << LV_AA); pos.x += letter_w + (style->text.letter_space << LV_AA);
/* Round error occurs in x position /* Round error occurs in x position
* When odd widths are scaled down the last 1 is lost. So the letters seems shorter. * When odd widths are scaled down the last 1 is lost. So the letters seems shorter.
* Now calculate according to is to be consequent */ * Now calculate according to it to be consequent */
if(letter_w & 0x01) pos.x--; if(letter_w & 0x01) pos.x--;
} }
/*Go to next line*/ /*Go to next line*/
lv_objx/lv_chart.c
+3 -3
View File
@@ -514,7 +514,7 @@ static void lv_chart_draw_lines(lv_obj_t * chart, const lv_area_t * mask)
{ {
lv_chart_ext_t * ext = lv_obj_get_ext_attr(chart); lv_chart_ext_t * ext = lv_obj_get_ext_attr(chart);
uint8_t i; uint16_t i;
lv_point_t p1; lv_point_t p1;
lv_point_t p2; lv_point_t p2;
lv_coord_t w = lv_obj_get_width(chart); lv_coord_t w = lv_obj_get_width(chart);
@@ -562,7 +562,7 @@ static void lv_chart_draw_points(lv_obj_t * chart, const lv_area_t * mask)
{ {
lv_chart_ext_t * ext = lv_obj_get_ext_attr(chart); lv_chart_ext_t * ext = lv_obj_get_ext_attr(chart);
uint8_t i; uint16_t i;
lv_area_t cir_a; lv_area_t cir_a;
lv_coord_t w = lv_obj_get_width(chart); lv_coord_t w = lv_obj_get_width(chart);
lv_coord_t h = lv_obj_get_height(chart); lv_coord_t h = lv_obj_get_height(chart);
@@ -611,7 +611,7 @@ static void lv_chart_draw_cols(lv_obj_t * chart, const lv_area_t * mask)
{ {
lv_chart_ext_t * ext = lv_obj_get_ext_attr(chart); lv_chart_ext_t * ext = lv_obj_get_ext_attr(chart);
uint8_t i; uint16_t i;
lv_area_t col_a; lv_area_t col_a;
lv_area_t col_mask; lv_area_t col_mask;
bool mask_ret; bool mask_ret;
lv_objx/lv_sw.h
+1 -1
View File
@@ -17,7 +17,7 @@ extern "C" {
#if USE_LV_SW != 0 #if USE_LV_SW != 0
/*Testing of dependencies*/ /*Testing of dependencies*/
#if USE_LV_SW == 0 #if USE_LV_SLIDER == 0
#error "lv_sw: lv_slider is required. Enable it in lv_conf.h (USE_LV_SLIDER 1)" #error "lv_sw: lv_slider is required. Enable it in lv_conf.h (USE_LV_SLIDER 1)"
#endif #endif
lv_objx/lv_tabview.c
+12 -12
View File
@@ -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_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 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_pressed_handler(lv_obj_t * tabview, lv_obj_t * tabpage);
static void tabpage_pressing_hadler(lv_obj_t * tabview, lv_obj_t * tabpage); static void tabpage_pressing_handler(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_press_lost_handler(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 lv_res_t tab_btnm_action(lv_obj_t * tab_btnm, const char * tab_name);
static void tabview_realign(lv_obj_t * tabview); 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(lv_tabview_get_sliding(tabview) == false) return res;
if(sign == LV_SIGNAL_PRESSED) { if(sign == LV_SIGNAL_PRESSED) {
tabpage_pressed_hadler(tabview, tab_page); tabpage_pressed_handler(tabview, tab_page);
} }
else if(sign == LV_SIGNAL_PRESSING) { else if(sign == LV_SIGNAL_PRESSING) {
tabpage_pressing_hadler(tabview, tab_page); tabpage_pressing_handler(tabview, tab_page);
} }
else if(sign == LV_SIGNAL_RELEASED || sign == LV_SIGNAL_PRESS_LOST) { else if(sign == LV_SIGNAL_RELEASED || sign == LV_SIGNAL_PRESS_LOST) {
tabpage_press_lost_hadler(tabview, tab_page); tabpage_press_lost_handler(tabview, tab_page);
} }
return res; 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(lv_tabview_get_sliding(tabview) == false) return res;
if(sign == LV_SIGNAL_PRESSED) { if(sign == LV_SIGNAL_PRESSED) {
tabpage_pressed_hadler(tabview, tab_page); tabpage_pressed_handler(tabview, tab_page);
} }
else if(sign == LV_SIGNAL_PRESSING) { else if(sign == LV_SIGNAL_PRESSING) {
tabpage_pressing_hadler(tabview, tab_page); tabpage_pressing_handler(tabview, tab_page);
} }
else if(sign == LV_SIGNAL_RELEASED || sign == LV_SIGNAL_PRESS_LOST) { else if(sign == LV_SIGNAL_RELEASED || sign == LV_SIGNAL_PRESS_LOST) {
tabpage_press_lost_hadler(tabview, tab_page); tabpage_press_lost_handler(tabview, tab_page);
} }
return res; 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 tabview pointer to the btn view object
* @param tabpage pointer to the page of a btn * @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_handler(lv_obj_t * tabview, lv_obj_t * tabpage)
{ {
(void)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 tabview pointer to the btn view object
* @param tabpage pointer to the page of a btn * @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_handler(lv_obj_t * tabview, lv_obj_t * tabpage)
{ {
lv_tabview_ext_t * ext = lv_obj_get_ext_attr(tabview); lv_tabview_ext_t * ext = lv_obj_get_ext_attr(tabview);
lv_indev_t * indev = lv_indev_get_act(); 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 tabview pointer to the btn view object
* @param tabpage pointer to the page of a btn * @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_handler(lv_obj_t * tabview, lv_obj_t * tabpage)
{ {
lv_tabview_ext_t * ext = lv_obj_get_ext_attr(tabview); lv_tabview_ext_t * ext = lv_obj_get_ext_attr(tabview);
ext->drag_hor = 0; ext->drag_hor = 0;
lv_objx/lv_win.h
-7
View File
@@ -124,13 +124,6 @@ void lv_win_set_title(lv_obj_t * win, const char * title);
*/ */
void lv_win_set_btn_size(lv_obj_t * win, lv_coord_t size); void lv_win_set_btn_size(lv_obj_t * win, lv_coord_t size);
/**
* Set the control button size of a window
* @param win pointer to a window object
* @param size control button size
*/
void lv_win_set_btn_size(lv_obj_t * win, lv_coord_t size);
/** /**
* Set the scroll bar mode of a window * Set the scroll bar mode of a window
* @param win pointer to a window object * @param win pointer to a window object