Updates to the widgets demo:
- Convert the image to a gif so it is smaller and has a transparent background - Move opening the mouse to the beginning to stop calibration flashing the screen (ugly) - Clean up extra defines in gfxconf.h - Conflicts with some drivers.
This commit is contained in:
inmarket
parent
ef0a1ef054
commit
df4d275183
@ -30,93 +30,19 @@
|
|||||||
///////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////
|
||||||
#define GFX_USE_GDISP TRUE
|
#define GFX_USE_GDISP TRUE
|
||||||
|
|
||||||
#define GDISP_NEED_AUTOFLUSH FALSE
|
|
||||||
#define GDISP_NEED_TIMERFLUSH FALSE
|
|
||||||
#define GDISP_NEED_VALIDATION TRUE
|
#define GDISP_NEED_VALIDATION TRUE
|
||||||
#define GDISP_NEED_CLIP TRUE
|
#define GDISP_NEED_CLIP TRUE
|
||||||
#define GDISP_NEED_CIRCLE TRUE
|
#define GDISP_NEED_CIRCLE TRUE
|
||||||
#define GDISP_NEED_ELLIPSE FALSE
|
|
||||||
#define GDISP_NEED_ARC FALSE
|
|
||||||
#define GDISP_NEED_CONVEX_POLYGON TRUE
|
#define GDISP_NEED_CONVEX_POLYGON TRUE
|
||||||
#define GDISP_NEED_SCROLL FALSE
|
//#define GDISP_NEED_SCROLL TRUE
|
||||||
#define GDISP_NEED_PIXELREAD FALSE
|
|
||||||
#define GDISP_NEED_CONTROL TRUE
|
#define GDISP_NEED_CONTROL TRUE
|
||||||
#define GDISP_NEED_QUERY FALSE
|
|
||||||
#define GDISP_NEED_MULTITHREAD FALSE
|
|
||||||
#define GDISP_NEED_STREAMING FALSE
|
|
||||||
#define GDISP_NEED_TEXT TRUE
|
#define GDISP_NEED_TEXT TRUE
|
||||||
#define GDISP_NEED_ANTIALIAS TRUE
|
|
||||||
#define GDISP_NEED_UTF8 TRUE
|
|
||||||
#define GDISP_NEED_TEXT_KERNING TRUE
|
|
||||||
#define GDISP_INCLUDE_FONT_UI1 FALSE
|
|
||||||
#define GDISP_INCLUDE_FONT_UI2 TRUE
|
#define GDISP_INCLUDE_FONT_UI2 TRUE
|
||||||
#define GDISP_INCLUDE_FONT_LARGENUMBERS FALSE
|
|
||||||
#define GDISP_INCLUDE_FONT_DEJAVUSANS10 FALSE
|
|
||||||
#define GDISP_INCLUDE_FONT_DEJAVUSANS12 FALSE
|
|
||||||
#define GDISP_INCLUDE_FONT_DEJAVUSANS16 FALSE
|
|
||||||
#define GDISP_INCLUDE_FONT_DEJAVUSANS24 FALSE
|
|
||||||
#define GDISP_INCLUDE_FONT_DEJAVUSANS32 FALSE
|
|
||||||
#define GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12 FALSE
|
|
||||||
#define GDISP_INCLUDE_FONT_FIXED_10X20 FALSE
|
|
||||||
#define GDISP_INCLUDE_FONT_FIXED_7X14 FALSE
|
|
||||||
#define GDISP_INCLUDE_FONT_FIXED_5X8 FALSE
|
|
||||||
#define GDISP_INCLUDE_FONT_DEJAVUSANS12_AA FALSE
|
|
||||||
#define GDISP_INCLUDE_FONT_DEJAVUSANS16_AA FALSE
|
|
||||||
#define GDISP_INCLUDE_FONT_DEJAVUSANS24_AA FALSE
|
|
||||||
#define GDISP_INCLUDE_FONT_DEJAVUSANS32_AA FALSE
|
|
||||||
#define GDISP_INCLUDE_FONT_DEJAVUSANSBOLD12_AA FALSE
|
|
||||||
#define GDISP_INCLUDE_USER_FONTS FALSE
|
|
||||||
|
|
||||||
#define GDISP_NEED_IMAGE TRUE
|
#define GDISP_NEED_IMAGE TRUE
|
||||||
#define GDISP_NEED_IMAGE_NATIVE FALSE
|
|
||||||
#define GDISP_NEED_IMAGE_GIF TRUE
|
#define GDISP_NEED_IMAGE_GIF TRUE
|
||||||
#define GDISP_NEED_IMAGE_BMP TRUE
|
|
||||||
#define GDISP_NEED_IMAGE_BMP_1 FALSE
|
|
||||||
#define GDISP_NEED_IMAGE_BMP_4 FALSE
|
|
||||||
#define GDISP_NEED_IMAGE_BMP_4_RLE FALSE
|
|
||||||
#define GDISP_NEED_IMAGE_BMP_8 FALSE
|
|
||||||
#define GDISP_NEED_IMAGE_BMP_8_RLE FALSE
|
|
||||||
#define GDISP_NEED_IMAGE_BMP_16 FALSE
|
|
||||||
#define GDISP_NEED_IMAGE_BMP_24 TRUE
|
|
||||||
#define GDISP_NEED_IMAGE_BMP_32 FALSE
|
|
||||||
#define GDISP_NEED_IMAGE_JPG FALSE
|
|
||||||
#define GDISP_NEED_IMAGE_PNG FALSE
|
|
||||||
#define GDISP_NEED_IMAGE_ACCOUNTING FALSE
|
|
||||||
|
|
||||||
#define GDISP_NEED_STARTUP_LOGO FALSE
|
|
||||||
|
|
||||||
#define GDISP_DEFAULT_ORIENTATION GDISP_ROTATE_LANDSCAPE
|
#define GDISP_DEFAULT_ORIENTATION GDISP_ROTATE_LANDSCAPE
|
||||||
#define GDISP_LINEBUF_SIZE 128
|
|
||||||
|
|
||||||
#define GDISP_TOTAL_DISPLAYS 1
|
|
||||||
#if GDISP_TOTAL_DISPLAYS > 1
|
|
||||||
#define GDISP_HARDWARE_STREAM_WRITE FALSE
|
|
||||||
#define GDISP_HARDWARE_STREAM_READ FALSE
|
|
||||||
#define GDISP_HARDWARE_STREAM_POS FALSE
|
|
||||||
#define GDISP_HARDWARE_DRAWPIXEL FALSE
|
|
||||||
#define GDISP_HARDWARE_CLEARS FALSE
|
|
||||||
#define GDISP_HARDWARE_FILLS FALSE
|
|
||||||
#define GDISP_HARDWARE_BITFILLS FALSE
|
|
||||||
#define GDISP_HARDWARE_SCROLL FALSE
|
|
||||||
#define GDISP_HARDWARE_PIXELREAD FALSE
|
|
||||||
#define GDISP_HARDWARE_CONTROL FALSE
|
|
||||||
#define GDISP_HARDWARE_QUERY FALSE
|
|
||||||
#define GDISP_HARDWARE_CLIP FALSE
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define GDISP_TOTAL_CONTROLLERS 1
|
|
||||||
#if GDISP_TOTAL_CONTROLLERS > 1
|
|
||||||
#define GDISP_CONTROLLER_LIST GDISPVMT_Win32, GDISPVMT_Win32
|
|
||||||
#define GDISP_CONTROLLER_DISPLAYS 1, 1
|
|
||||||
#define GDISP_PIXELFORMAT GDISP_PIXELFORMAT_RGB888
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define GDISP_USE_GFXNET FALSE
|
|
||||||
#define GDISP_GFXNET_PORT 13001
|
|
||||||
#define GDISP_GFXNET_CUSTOM_LWIP_STARTUP FALSE
|
|
||||||
#define GDISP_DONT_WAIT_FOR_NET_DISPLAY FALSE
|
|
||||||
#define GDISP_GFXNET_UNSAFE_SOCKETS FALSE
|
|
||||||
|
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////
|
||||||
// GWIN //
|
// GWIN //
|
||||||
@ -126,56 +52,36 @@
|
|||||||
#define GWIN_NEED_WINDOWMANAGER TRUE
|
#define GWIN_NEED_WINDOWMANAGER TRUE
|
||||||
|
|
||||||
#define GWIN_NEED_CONSOLE TRUE
|
#define GWIN_NEED_CONSOLE TRUE
|
||||||
#define GWIN_CONSOLE_USE_HISTORY FALSE
|
|
||||||
#define GWIN_CONSOLE_HISTORY_AVERAGING FALSE
|
|
||||||
#define GWIN_CONSOLE_HISTORY_ATCREATE FALSE
|
|
||||||
#define GWIN_CONSOLE_ESCSEQ FALSE
|
|
||||||
#define GWIN_CONSOLE_USE_BASESTREAM FALSE
|
|
||||||
#define GWIN_CONSOLE_USE_FLOAT FALSE
|
|
||||||
#define GWIN_NEED_GRAPH TRUE
|
#define GWIN_NEED_GRAPH TRUE
|
||||||
|
|
||||||
#define GWIN_NEED_WIDGET TRUE
|
#define GWIN_NEED_WIDGET TRUE
|
||||||
#define GWIN_NEED_LABEL TRUE
|
#define GWIN_NEED_LABEL TRUE
|
||||||
#define GWIN_NEED_BUTTON TRUE
|
#define GWIN_NEED_BUTTON TRUE
|
||||||
#define GWIN_BUTTON_LAZY_RELEASE FALSE
|
// #define GWIN_BUTTON_LAZY_RELEASE TRUE
|
||||||
#define GWIN_NEED_SLIDER TRUE
|
#define GWIN_NEED_SLIDER TRUE
|
||||||
#define GWIN_NEED_CHECKBOX TRUE
|
#define GWIN_NEED_CHECKBOX TRUE
|
||||||
#define GWIN_NEED_IMAGE TRUE
|
#define GWIN_NEED_IMAGE TRUE
|
||||||
#define GWIN_NEED_IMAGE_ANIMATION TRUE
|
|
||||||
#define GWIN_NEED_RADIO TRUE
|
#define GWIN_NEED_RADIO TRUE
|
||||||
#define GWIN_NEED_LIST TRUE
|
#define GWIN_NEED_LIST TRUE
|
||||||
#define GWIN_NEED_LIST_IMAGES TRUE
|
#define GWIN_NEED_LIST_IMAGES TRUE
|
||||||
#define GWIN_NEED_PROGRESSBAR TRUE
|
#define GWIN_NEED_PROGRESSBAR TRUE
|
||||||
|
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////
|
||||||
// GEVENT //
|
// GEVENT //
|
||||||
///////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////
|
||||||
#define GFX_USE_GEVENT TRUE
|
#define GFX_USE_GEVENT TRUE
|
||||||
|
|
||||||
#define GEVENT_ASSERT_NO_RESOURCE FALSE
|
|
||||||
#define GEVENT_MAXIMUM_SIZE 32
|
|
||||||
#define GEVENT_MAX_SOURCE_LISTENERS 32
|
|
||||||
|
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////
|
||||||
// GTIMER //
|
// GTIMER //
|
||||||
///////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////
|
||||||
#define GFX_USE_GTIMER TRUE
|
#define GFX_USE_GTIMER TRUE
|
||||||
|
|
||||||
#define GTIMER_THREAD_PRIORITY HIGH_PRIORITY
|
|
||||||
#define GTIMER_THREAD_WORKAREA_SIZE 2048
|
|
||||||
|
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////
|
||||||
// GQUEUE //
|
// GQUEUE //
|
||||||
///////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////
|
||||||
#define GFX_USE_GQUEUE TRUE
|
#define GFX_USE_GQUEUE TRUE
|
||||||
|
|
||||||
#define GQUEUE_NEED_ASYNC TRUE
|
#define GQUEUE_NEED_ASYNC TRUE
|
||||||
#define GQUEUE_NEED_GSYNC FALSE
|
|
||||||
#define GQUEUE_NEED_FSYNC FALSE
|
|
||||||
#define GQUEUE_NEED_BUFFERS FALSE
|
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////
|
||||||
// GINPUT //
|
// GINPUT //
|
||||||
@ -183,59 +89,15 @@
|
|||||||
#define GFX_USE_GINPUT TRUE
|
#define GFX_USE_GINPUT TRUE
|
||||||
|
|
||||||
#define GINPUT_NEED_MOUSE TRUE
|
#define GINPUT_NEED_MOUSE TRUE
|
||||||
#define GINPUT_NEED_KEYBOARD FALSE
|
//#define GINPUT_NEED_TOGGLE TRUE
|
||||||
#define GINPUT_NEED_TOGGLE FALSE
|
//#define GINPUT_NEED_DIAL TRUE
|
||||||
#define GINPUT_NEED_DIAL FALSE
|
|
||||||
|
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////
|
||||||
// GFILE //
|
// GFILE //
|
||||||
///////////////////////////////////////////////////////////////////////////
|
///////////////////////////////////////////////////////////////////////////
|
||||||
#define GFX_USE_GFILE TRUE
|
#define GFX_USE_GFILE TRUE
|
||||||
|
|
||||||
#define GFILE_NEED_PRINTG FALSE
|
|
||||||
#define GFILE_NEED_SCANG FALSE
|
|
||||||
#define GFILE_NEED_STRINGS FALSE
|
|
||||||
#define GFILE_NEED_STDIO FALSE
|
|
||||||
#define GFILE_ALLOW_FLOATS FALSE
|
|
||||||
#define GFILE_ALLOW_DEVICESPECIFIC FALSE
|
|
||||||
#define GFILE_MAX_GFILES 3
|
|
||||||
|
|
||||||
#define GFILE_NEED_MEMFS FALSE
|
|
||||||
#define GFILE_NEED_ROMFS TRUE
|
#define GFILE_NEED_ROMFS TRUE
|
||||||
#define GFILE_NEED_RAMFS FALSE
|
//#define GFILE_NEED_NATIVEFS TRUE
|
||||||
#define GFILE_NEED_FATFS FALSE
|
|
||||||
#define GFILE_NEED_NATIVEFS FALSE
|
|
||||||
#define GFILE_NEED_CHBIOSFS FALSE
|
|
||||||
|
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////
|
|
||||||
// GADC //
|
|
||||||
///////////////////////////////////////////////////////////////////////////
|
|
||||||
#define GFX_USE_GADC FALSE
|
|
||||||
|
|
||||||
#define GADC_MAX_LOWSPEED_DEVICES 4
|
|
||||||
|
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////
|
|
||||||
// GAUDIO //
|
|
||||||
///////////////////////////////////////////////////////////////////////////
|
|
||||||
#define GFX_USE_GAUDIO FALSE
|
|
||||||
#define GAUDIO_NEED_PLAY FALSE
|
|
||||||
#define GAUDIO_NEED_RECORD FALSE
|
|
||||||
|
|
||||||
|
|
||||||
///////////////////////////////////////////////////////////////////////////
|
|
||||||
// GMISC //
|
|
||||||
///////////////////////////////////////////////////////////////////////////
|
|
||||||
#define GFX_USE_GMISC FALSE
|
|
||||||
|
|
||||||
#define GMISC_NEED_ARRAYOPS FALSE
|
|
||||||
#define GMISC_NEED_FASTTRIG FALSE
|
|
||||||
#define GMISC_NEED_FIXEDTRIG FALSE
|
|
||||||
#define GMISC_NEED_INVSQRT FALSE
|
|
||||||
#define GMISC_INVSQRT_MIXED_ENDIAN FALSE
|
|
||||||
#define GMISC_INVSQRT_REAL_SLOW FALSE
|
|
||||||
|
|
||||||
|
|
||||||
#endif /* _GFXCONF_H */
|
#endif /* _GFXCONF_H */
|
||||||
|
|||||||
@ -258,7 +258,7 @@ static void createWidgets(void) {
|
|||||||
// Image
|
// Image
|
||||||
wi.g.x = 20; wi.g.y = 2*TAB_HEIGHT+20; wi.g.width = 200; wi.g.height = 100;
|
wi.g.x = 20; wi.g.y = 2*TAB_HEIGHT+20; wi.g.width = 200; wi.g.height = 100;
|
||||||
ghImage1 = gwinImageCreate(0, &wi.g);
|
ghImage1 = gwinImageCreate(0, &wi.g);
|
||||||
gwinImageOpenFile(ghImage1, "romfs_img_ugfx.bmp");
|
gwinImageOpenFile(ghImage1, "romfs_img_ugfx.gif");
|
||||||
|
|
||||||
// Progressbar
|
// Progressbar
|
||||||
wi.g.show = FALSE; wi.customDraw = 0;
|
wi.g.show = FALSE; wi.customDraw = 0;
|
||||||
@ -381,16 +381,16 @@ int main(void) {
|
|||||||
// Initialize the display
|
// Initialize the display
|
||||||
gfxInit();
|
gfxInit();
|
||||||
|
|
||||||
// Set the widget defaults
|
|
||||||
gwinSetDefaultFont(gdispOpenFont("*"));
|
|
||||||
gwinSetDefaultStyle(&WhiteWidgetStyle, FALSE);
|
|
||||||
gdispClear(White);
|
|
||||||
|
|
||||||
// Connect the mouse
|
// Connect the mouse
|
||||||
#if GINPUT_NEED_MOUSE
|
#if GINPUT_NEED_MOUSE
|
||||||
gwinAttachMouse(0);
|
gwinAttachMouse(0);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// Set the widget defaults
|
||||||
|
gwinSetDefaultFont(gdispOpenFont("*"));
|
||||||
|
gwinSetDefaultStyle(&WhiteWidgetStyle, FALSE);
|
||||||
|
gdispClear(White);
|
||||||
|
|
||||||
// Create the gwin windows/widgets
|
// Create the gwin windows/widgets
|
||||||
createWidgets();
|
createWidgets();
|
||||||
|
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
Binary file not shown.
|
Before Width: | Height: | Size: 26 KiB |
BIN
demos/modules/gwin/widgets/rsc/romfs_img_ugfx.gif
Normal file
BIN
demos/modules/gwin/widgets/rsc/romfs_img_ugfx.gif
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.5 KiB |
Loading…
Reference in New Issue
Block a user