mirror of
https://gitee.com/zlgopen/awtk.git
synced 2024-11-30 02:58:26 +08:00
Merge branch 'master' of https://github.com/zlgopen/awtk
This commit is contained in:
commit
a048f1c89e
@ -124,7 +124,6 @@
|
||||
#include "assets/default/inc/images/num_6.res"
|
||||
#include "assets/default/inc/images/shift.res"
|
||||
#include "assets/default/inc/images/earth.res"
|
||||
#include "assets/default/inc/images/bee.res"
|
||||
#include "assets/default/inc/images/contact.res"
|
||||
#include "assets/default/inc/images/battery_4.res"
|
||||
#include "assets/default/inc/images/num_4.res"
|
||||
@ -167,7 +166,6 @@
|
||||
#include "assets/default/inc/images/msg_active.res"
|
||||
#include "assets/default/inc/images/radio_checked.res"
|
||||
#include "assets/default/inc/images/active_dot.res"
|
||||
#include "assets/default/inc/images/zh.res"
|
||||
#include "assets/default/inc/images/question.res"
|
||||
#include "assets/default/inc/images/discovery_active.res"
|
||||
#include "assets/default/inc/images/dot.res"
|
||||
@ -243,7 +241,6 @@
|
||||
#include "assets/default/inc/images/rgb.data"
|
||||
#include "assets/default/inc/images/num_9.data"
|
||||
#include "assets/default/inc/images/dot.data"
|
||||
#include "assets/default/inc/images/ani2.data"
|
||||
#include "assets/default/inc/images/battery_0.data"
|
||||
#include "assets/default/inc/images/find.data"
|
||||
#include "assets/default/inc/images/slider_fg.data"
|
||||
@ -255,7 +252,6 @@
|
||||
#include "assets/default/inc/images/num_5.data"
|
||||
#include "assets/default/inc/images/num_dot.data"
|
||||
#include "assets/default/inc/images/arrow_right_n.data"
|
||||
#include "assets/default/inc/images/bee.data"
|
||||
#include "assets/default/inc/images/visible.data"
|
||||
#include "assets/default/inc/images/me_active.data"
|
||||
#include "assets/default/inc/images/cursor.data"
|
||||
@ -478,7 +474,6 @@ ret_t assets_init(void) {
|
||||
assets_manager_add(am, image_num_5);
|
||||
assets_manager_add(am, image_num_dot);
|
||||
assets_manager_add(am, image_arrow_right_n);
|
||||
assets_manager_add(am, image_bee);
|
||||
assets_manager_add(am, image_visible);
|
||||
assets_manager_add(am, image_me_active);
|
||||
assets_manager_add(am, image_cursor);
|
||||
@ -487,7 +482,6 @@ ret_t assets_init(void) {
|
||||
assets_manager_add(am, image_checked);
|
||||
assets_manager_add(am, image_middle_off);
|
||||
assets_manager_add(am, image_close_p);
|
||||
assets_manager_add(am, image_zh);
|
||||
assets_manager_add(am, image_arrow_right_p);
|
||||
assets_manager_add(am, image_num_2);
|
||||
assets_manager_add(am, image_arrow_up_o);
|
||||
|
@ -1,4 +1,4 @@
|
||||
/**
|
||||
/**
|
||||
* File: list_item.h
|
||||
* Author: AWTK Develop Team
|
||||
* Brief: list_item
|
||||
@ -85,8 +85,6 @@ static ret_t list_item_on_event(widget_t* widget, event_t* e) {
|
||||
break;
|
||||
}
|
||||
case EVT_POINTER_UP: {
|
||||
pointer_event_t* evt = (pointer_event_t*)e;
|
||||
|
||||
list_item_remove_timer(widget);
|
||||
widget_invalidate_force(widget, NULL);
|
||||
widget_set_state(widget, WIDGET_STATE_NORMAL);
|
||||
|
@ -331,8 +331,6 @@ static ret_t lcd_mem_flush(lcd_t* lcd) {
|
||||
}
|
||||
|
||||
static ret_t lcd_mem_end_frame(lcd_t* lcd) {
|
||||
lcd_mem_t* mem = (lcd_mem_t*)lcd;
|
||||
|
||||
if (lcd->draw_mode != LCD_DRAW_OFFLINE) {
|
||||
if (lcd_is_swappable(lcd)) {
|
||||
lcd_swap(lcd);
|
||||
|
Loading…
Reference in New Issue
Block a user