Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

To support FreeRTOS #269

Open
wants to merge 66 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
7f5d353
fix cloned edit display bug
xianjimli Oct 23, 2019
cd8bb10
format code
xianjimli Oct 23, 2019
9d92671
improve set theme
xianjimli Oct 23, 2019
11dbe74
fix combo_box clone
xianjimli Oct 23, 2019
d10243e
refactor emitter and add emitter_on_with_tag/emitter_off_by_tag
xianjimli Oct 23, 2019
075e395
add widget_on_with_tag/wuidget_off_by_tag
xianjimli Oct 23, 2019
cb48214
fix WHEEL event when list view in list view
xianjimli Oct 23, 2019
d3f9f26
improve text selector
xianjimli Oct 23, 2019
c222773
improve text selector
xianjimli Oct 23, 2019
3f29eee
fix svg crash when image file is invalid
xianjimli Oct 23, 2019
28d3c9c
add assets_manager_set_custom_build_asset_dir
xianjimli Oct 23, 2019
260cf96
improve reset canvas
xianjimli Oct 24, 2019
24e673a
remove warnings
xianjimli Oct 24, 2019
4fbbd33
fix warnings
xianjimli Oct 24, 2019
548bdac
update docs
xianjimli Oct 24, 2019
91f9b80
update assets
xianjimli Oct 24, 2019
e8c19ec
format code
xianjimli Oct 24, 2019
ae04045
improve fragment frame buffer
xianjimli Oct 24, 2019
573267b
improve awtk config sample
xianjimli Oct 24, 2019
f1e3d05
fix linebreak include
xianjimli Oct 24, 2019
5244eaf
change some data to const
xianjimli Oct 24, 2019
4bc2e40
fix warnings
xianjimli Oct 24, 2019
4ec8b6b
format code
xianjimli Oct 24, 2019
ea6b943
improve input method
xianjimli Oct 24, 2019
68dae23
improve input method
xianjimli Oct 24, 2019
1985133
improve window manager default
xianjimli Oct 24, 2019
5c8b426
update docs
xianjimli Oct 24, 2019
ce27844
merge patch of issue #257
xianjimli Oct 24, 2019
1b5b8cb
merge chinese filename bug on windows
xianjimli Oct 24, 2019
e04e441
assets_manager_set_custom_build_asset_dir support ctx
xianjimli Oct 24, 2019
fb0fdb7
format code
Oct 24, 2019
f6e97ba
add widget_off_by_ctx/on_detach_parent/on_attach_parent
Oct 24, 2019
683c4df
add draggable
Oct 25, 2019
3c44dcc
improve preview ui
xianjimli Oct 25, 2019
d056f58
improve draggable
xianjimli Oct 25, 2019
b1d31f0
update docs
xianjimli Oct 25, 2019
e72a9d4
update docs
xianjimli Oct 25, 2019
76d2ac3
update docs
xianjimli Oct 25, 2019
55f3491
format code
xianjimli Oct 25, 2019
7dfe407
merge nanovg unload font patch
xianjimli Oct 25, 2019
f96a67e
improve preview ui
xianjimli Oct 25, 2019
380e4d8
improve ring buffer
Oct 26, 2019
ef661ea
add ostream_retry
Oct 26, 2019
e31d3c9
fix test
Oct 26, 2019
0f1a11b
add semaphore
Oct 27, 2019
366faf7
improve semaphore
xianjimli Oct 27, 2019
4c47eb1
improve semaphore
xianjimli Oct 27, 2019
9adf200
improve cmsis_os port
xianjimli Oct 27, 2019
f7a058a
fix tests
xianjimli Oct 28, 2019
af8580d
font_loader_ft: Load mono font if WITH_LCD_MONO defined
qianfan-Zhao Oct 28, 2019
379a710
merge slide indicator patch
xianjimli Oct 29, 2019
ed8521a
merge svg patch
xianjimli Oct 29, 2019
e678038
merge popup patch
xianjimli Oct 29, 2019
866b9a7
update docs
xianjimli Oct 29, 2019
640d5b9
fix compile error on im28x
xianjimli Oct 29, 2019
36d71dc
improve vgcanvas_nanovg_set_font
xianjimli Oct 29, 2019
0af0292
update docs
xianjimli Oct 29, 2019
5952a19
fix build_asset_filename_custom
xianjimli Oct 29, 2019
2262298
fix build_asset_filename_custom
xianjimli Oct 29, 2019
a80bf23
make image_animation_next public
xianjimli Oct 30, 2019
c40dc8c
merge sdl patch
xianjimli Oct 30, 2019
0116b1b
fix image_animation_next
xianjimli Oct 30, 2019
c5b09b9
improve lcd mono
xianjimli Oct 30, 2019
c981c0f
improve system bar
xianjimli Oct 30, 2019
190a54b
fix linux compile error
xianjimli Oct 30, 2019
26cd867
feature: support freertos
jason-mao Oct 30, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions 3rd/SDL/src/video/windows/SDL_windowsevents.c
Original file line number Diff line number Diff line change
Expand Up @@ -629,6 +629,9 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
case WM_KEYDOWN:
case WM_SYSKEYDOWN:
{
if(wParam == VK_PROCESSKEY) {
break;
}
SDL_Scancode code = WindowsScanCodeToSDLScanCode(lParam, wParam);
const Uint8 *keyboardState = SDL_GetKeyboardState(NULL);

Expand Down
2 changes: 1 addition & 1 deletion 3rd/freetype_single_header/freetype.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#pragma once
#pragma once

#if defined(_MSC_VER) && !defined(__clang__)
# pragma warning(push)
Expand Down
2 changes: 1 addition & 1 deletion 3rd/libunibreak/linebreak.c
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ enum BreakAction
* adjusted after special processing as per LB8a of Revision 41) and CB
* (manually added as per LB20).
*/
static enum BreakAction baTable[LBP_CB][LBP_CB] = {
static const enum BreakAction baTable[LBP_CB][LBP_CB] = {
{ /* OP */
PRH_BRK, PRH_BRK, PRH_BRK, PRH_BRK, PRH_BRK, PRH_BRK, PRH_BRK,
PRH_BRK, PRH_BRK, PRH_BRK, PRH_BRK, PRH_BRK, PRH_BRK, PRH_BRK,
Expand Down
31 changes: 31 additions & 0 deletions 3rd/nanovg/base/fontstash.h
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,8 @@ typedef struct FONScontext FONScontext;
FONScontext* fonsCreateInternal(FONSparams* params);
void fonsDeleteInternal(FONScontext* s);

void fontsDeleteFontByName(FONScontext* stash, const char* name);

void fonsSetErrorCallback(FONScontext* s, void (*callback)(void* uptr, int error, int val), void* uptr);
// Returns current atlas size.
void fonsGetAtlasSize(FONScontext* s, int* width, int* height);
Expand Down Expand Up @@ -1628,6 +1630,35 @@ int fonsValidateTexture(FONScontext* stash, int* dirty)
return 0;
}

void fontsDeleteFontByName(FONScontext* stash, const char* name)
{
int id = 0;
if (stash == NULL) return;
if(name == NULL) {
for (id = 0; id < stash->nfonts; ++id) {
fons__freeFont(stash->fonts[id]);
}
stash->nfonts = 0;
}
else {
id = fonsGetFontByName(stash, name);
if(id >= 0) {
fons__freeFont(stash->fonts[id]);

for(; id < stash->nfonts; id++) {
if(id + 1 < stash->nfonts) {
stash->fonts[id] = stash->fonts[id + 1];
}
else {
stash->fonts[id] = NULL;
break;
}
}
stash->nfonts--;
}
}
}

void fonsDeleteInternal(FONScontext* stash)
{
int i;
Expand Down
9 changes: 9 additions & 0 deletions 3rd/nanovg/base/nanovg.c
Original file line number Diff line number Diff line change
Expand Up @@ -867,6 +867,15 @@ void nvgImageSize(NVGcontext* ctx, int image, int* w, int* h)
ctx->params.renderGetTextureSize(ctx->params.userPtr, image, w, h);
}

void nvgDeleteFontByName(NVGcontext* ctx, const char* name)
{
#ifdef WITH_NANOVG_GPU
if (ctx->fs) {
fontsDeleteFontByName(ctx->fs, name);
}
#endif
}

void nvgDeleteImage(NVGcontext* ctx, int image)
{
ctx->params.renderDeleteTexture(ctx->params.userPtr, image);
Expand Down
3 changes: 3 additions & 0 deletions 3rd/nanovg/base/nanovg.h
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,9 @@ void nvgImageSize(NVGcontext* ctx, int image, int* w, int* h);
// Deletes created image.
void nvgDeleteImage(NVGcontext* ctx, int image);

// Deletes font's assets for font's name.
void nvgDeleteFontByName(NVGcontext* ctx, const char* name);

//
// Paints
//
Expand Down
Loading