From 85aa1f03edd406f1499e4835e1591ad545e5354e Mon Sep 17 00:00:00 2001 From: inmarket Date: Wed, 18 Sep 2013 23:40:17 +1000 Subject: Use scrolling console in widget demo by default --- demos/modules/gwin/widgets/gfxconf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'demos/modules/gwin/widgets') diff --git a/demos/modules/gwin/widgets/gfxconf.h b/demos/modules/gwin/widgets/gfxconf.h index 50fcbf58..0bf8443a 100644 --- a/demos/modules/gwin/widgets/gfxconf.h +++ b/demos/modules/gwin/widgets/gfxconf.h @@ -48,7 +48,7 @@ #define GDISP_NEED_ELLIPSE FALSE #define GDISP_NEED_ARC FALSE #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 FALSE #define GDISP_NEED_IMAGE TRUE -- cgit v1.2.3 From 7ba622b797696dd894c427617fa71ed3ca3b4f02 Mon Sep 17 00:00:00 2001 From: inmarket Date: Thu, 24 Oct 2013 16:52:17 +1000 Subject: Add initial orientation to the widgets demo. --- demos/modules/gwin/widgets/main.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'demos/modules/gwin/widgets') diff --git a/demos/modules/gwin/widgets/main.c b/demos/modules/gwin/widgets/main.c index 31b65a65..0dec7275 100644 --- a/demos/modules/gwin/widgets/main.c +++ b/demos/modules/gwin/widgets/main.c @@ -262,6 +262,10 @@ int main(void) { // Initialize the display gfxInit(); + #if GDISP_NEED_CONTROL + gdispSetOrientation(GDISP_ROTATE_90); + #endif + // Set the widget defaults gwinSetDefaultFont(gdispOpenFont("*")); gwinSetDefaultStyle(&WhiteWidgetStyle, FALSE); -- cgit v1.2.3 From 2832f97fed4cf413a078995e6ca2068e13aabc1d Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Sat, 26 Oct 2013 17:52:49 +0200 Subject: fixed orientation stuff in widgets demo --- demos/modules/gwin/widgets/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'demos/modules/gwin/widgets') diff --git a/demos/modules/gwin/widgets/main.c b/demos/modules/gwin/widgets/main.c index 0dec7275..dde955f3 100644 --- a/demos/modules/gwin/widgets/main.c +++ b/demos/modules/gwin/widgets/main.c @@ -262,10 +262,6 @@ int main(void) { // Initialize the display gfxInit(); - #if GDISP_NEED_CONTROL - gdispSetOrientation(GDISP_ROTATE_90); - #endif - // Set the widget defaults gwinSetDefaultFont(gdispOpenFont("*")); gwinSetDefaultStyle(&WhiteWidgetStyle, FALSE); @@ -276,6 +272,10 @@ int main(void) { gwinAttachMouse(0); #endif + #if GDISP_NEED_CONTROL + gdispSetOrientation(GDISP_ROTATE_90); + #endif + // Create the gwin windows/widgets createWidgets(); -- cgit v1.2.3 From 36c55722ddc06af682d7c7bdeb71ba75a3b0fb83 Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Mon, 28 Oct 2013 00:42:38 +0100 Subject: updated GDISP and GWIN demos --- demos/modules/gwin/widgets/gfxconf.h | 55 +++++++++++++++--------------------- demos/modules/gwin/widgets/main.c | 1 + 2 files changed, 24 insertions(+), 32 deletions(-) (limited to 'demos/modules/gwin/widgets') diff --git a/demos/modules/gwin/widgets/gfxconf.h b/demos/modules/gwin/widgets/gfxconf.h index 0bf8443a..ed6be366 100644 --- a/demos/modules/gwin/widgets/gfxconf.h +++ b/demos/modules/gwin/widgets/gfxconf.h @@ -1,6 +1,7 @@ /* * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu * Copyright (c) 2012, 2013, Andrew Hannam aka inmarket + * * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -29,62 +30,52 @@ #ifndef _GFXCONF_H #define _GFXCONF_H -//#define GFX_USE_OS_CHIBIOS TRUE -//#define GFX_USE_OS_WIN32 TRUE -//#define GFX_USE_OS_POSIX TRUE +/* The operating system to use - one of these must be defined */ +#define GFX_USE_OS_CHIBIOS FALSE +#define GFX_USE_OS_WIN32 FALSE +#define GFX_USE_OS_LINUX FALSE +#define GFX_USE_OS_OSX FALSE /* GFX sub-systems to turn on */ #define GFX_USE_GDISP TRUE #define GFX_USE_GWIN TRUE +#define GFX_USE_GINPUT TRUE #define GFX_USE_GEVENT TRUE #define GFX_USE_GTIMER TRUE -#define GFX_USE_GINPUT TRUE /* Features for the GDISP sub-system. */ -#define GDISP_NEED_VALIDATION TRUE -#define GDISP_NEED_CLIP TRUE -#define GDISP_NEED_TEXT 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_SCROLL TRUE -#define GDISP_NEED_PIXELREAD FALSE -#define GDISP_NEED_CONTROL FALSE -#define GDISP_NEED_IMAGE TRUE -#define GDISP_NEED_MULTITHREAD TRUE -#define GDISP_NEED_ASYNC FALSE -#define GDISP_NEED_MSGAPI FALSE +#define GDISP_NEED_VALIDATION TRUE +#define GDISP_NEED_CLIP TRUE +#define GDISP_NEED_CIRCLE TRUE +#define GDISP_NEED_TEXT TRUE +#define GDISP_NEED_SCROLL TRUE +#define GDISP_NEED_IMAGE TRUE -/* Builtin Fonts */ -#define GDISP_INCLUDE_FONT_UI2 TRUE -#define GDISP_NEED_ANTIALIAS FALSE +/* GDISP fonts to include */ +#define GDISP_INCLUDE_FONT_UI2 TRUE /* GDISP image decoders */ -#define GDISP_NEED_IMAGE_NATIVE FALSE #define GDISP_NEED_IMAGE_GIF TRUE -#define GDISP_NEED_IMAGE_BMP FALSE -#define GDISP_NEED_IMAGE_JPG FALSE -#define GDISP_NEED_IMAGE_PNG FALSE +#define GDISP_NEED_IMAGE_BMP TRUE -/* Features for the GWIN sub-system. */ +/* Features for the GWIN subsystem. */ #define GWIN_NEED_WINDOWMANAGER TRUE #define GWIN_NEED_CONSOLE TRUE #define GWIN_NEED_GRAPH TRUE #define GWIN_NEED_WIDGET TRUE +#define GWIN_NEED_LABEL TRUE #define GWIN_NEED_BUTTON TRUE #define GWIN_NEED_SLIDER TRUE #define GWIN_NEED_CHECKBOX TRUE -#define GWIN_NEED_LABEL TRUE #define GWIN_NEED_IMAGE TRUE #define GWIN_NEED_RADIO TRUE #define GWIN_NEED_LIST TRUE -#define GWIN_NEED_IMAGE_ANIMATION TRUE -#define GWIN_NEED_LIST_IMAGES TRUE -/* Features for the GINPUT sub-system. */ +/* Features for the GINPUT subsystem. */ #define GINPUT_NEED_MOUSE TRUE -#define GINPUT_NEED_TOGGLE FALSE -#define GINPUT_NEED_DIAL FALSE + +/* Optional parameters for various subsystems */ +#define GWIN_NEED_LIST_IMAGES TRUE #endif /* _GFXCONF_H */ + diff --git a/demos/modules/gwin/widgets/main.c b/demos/modules/gwin/widgets/main.c index dde955f3..2b14d79e 100644 --- a/demos/modules/gwin/widgets/main.c +++ b/demos/modules/gwin/widgets/main.c @@ -382,3 +382,4 @@ int main(void) { } return 0; } + -- cgit v1.2.3 From 2cb8e08c525e140a20982cb14e59ebd7782f2792 Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Mon, 28 Oct 2013 01:00:02 +0100 Subject: uncommented GOS selection in GDISP and GWIN demos --- demos/modules/gwin/widgets/gfxconf.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'demos/modules/gwin/widgets') diff --git a/demos/modules/gwin/widgets/gfxconf.h b/demos/modules/gwin/widgets/gfxconf.h index ed6be366..43094bf5 100644 --- a/demos/modules/gwin/widgets/gfxconf.h +++ b/demos/modules/gwin/widgets/gfxconf.h @@ -30,11 +30,11 @@ #ifndef _GFXCONF_H #define _GFXCONF_H -/* The operating system to use - one of these must be defined */ -#define GFX_USE_OS_CHIBIOS FALSE -#define GFX_USE_OS_WIN32 FALSE -#define GFX_USE_OS_LINUX FALSE -#define GFX_USE_OS_OSX FALSE +/* The operating system to use. One of these must be defined - perferably in your Makefile */ +//#define GFX_USE_OS_CHIBIOS FALSE +//#define GFX_USE_OS_WIN32 FALSE +//#define GFX_USE_OS_LINUX FALSE +//#define GFX_USE_OS_OSX FALSE /* GFX sub-systems to turn on */ #define GFX_USE_GDISP TRUE -- cgit v1.2.3 From db09e33dff7110861ce2fa586b04c05626e3f7e8 Mon Sep 17 00:00:00 2001 From: inmarket Date: Mon, 28 Oct 2013 10:46:25 +1000 Subject: Fix spelling error and migrate demo gfxconf.h changes to all demos including the new streaming and multiple display demos --- demos/modules/gwin/widgets/gfxconf.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'demos/modules/gwin/widgets') diff --git a/demos/modules/gwin/widgets/gfxconf.h b/demos/modules/gwin/widgets/gfxconf.h index 43094bf5..602a559c 100644 --- a/demos/modules/gwin/widgets/gfxconf.h +++ b/demos/modules/gwin/widgets/gfxconf.h @@ -30,11 +30,11 @@ #ifndef _GFXCONF_H #define _GFXCONF_H -/* The operating system to use. One of these must be defined - perferably in your Makefile */ -//#define GFX_USE_OS_CHIBIOS FALSE +/* The operating system to use. One of these must be defined - preferably in your Makefile */ +//#define GFX_USE_OS_CHIBIOS FALSE //#define GFX_USE_OS_WIN32 FALSE //#define GFX_USE_OS_LINUX FALSE -//#define GFX_USE_OS_OSX FALSE +//#define GFX_USE_OS_OSX FALSE /* GFX sub-systems to turn on */ #define GFX_USE_GDISP TRUE -- cgit v1.2.3 From 553dea5fcdd38a8bbc09c9181199916fd36a841b Mon Sep 17 00:00:00 2001 From: inmarket Date: Tue, 29 Oct 2013 01:11:25 +1000 Subject: Make the hardware depedant options clearer for the widgets demo --- demos/modules/gwin/widgets/gfxconf.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'demos/modules/gwin/widgets') diff --git a/demos/modules/gwin/widgets/gfxconf.h b/demos/modules/gwin/widgets/gfxconf.h index 602a559c..7899bfb8 100644 --- a/demos/modules/gwin/widgets/gfxconf.h +++ b/demos/modules/gwin/widgets/gfxconf.h @@ -48,8 +48,12 @@ #define GDISP_NEED_CLIP TRUE #define GDISP_NEED_CIRCLE TRUE #define GDISP_NEED_TEXT TRUE -#define GDISP_NEED_SCROLL TRUE #define GDISP_NEED_IMAGE TRUE +#define GDISP_NEED_CONVEX_POLYGON TRUE + +/* The following are optional depending on your hardware */ +//#define GDISP_NEED_SCROLL TRUE +//#define GDISP_NEED_CONTROL TRUE /* GDISP fonts to include */ #define GDISP_INCLUDE_FONT_UI2 TRUE -- cgit v1.2.3 From 1f99d5c9fac79e3e9aa4ebff97b296b6dcb9c9a7 Mon Sep 17 00:00:00 2001 From: inmarket Date: Sat, 9 Nov 2013 19:18:59 +1000 Subject: Add support for a default application orientation. Also remove old unneeded GDISP_USE_CUSTOM_BOARD macro --- demos/modules/gwin/widgets/gfxconf.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'demos/modules/gwin/widgets') diff --git a/demos/modules/gwin/widgets/gfxconf.h b/demos/modules/gwin/widgets/gfxconf.h index 7899bfb8..111979e3 100644 --- a/demos/modules/gwin/widgets/gfxconf.h +++ b/demos/modules/gwin/widgets/gfxconf.h @@ -50,10 +50,11 @@ #define GDISP_NEED_TEXT TRUE #define GDISP_NEED_IMAGE TRUE #define GDISP_NEED_CONVEX_POLYGON TRUE +#define GDISP_NEED_CONTROL TRUE +#define GDISP_DEFAULT_ORIENTATION GDISP_ROTATE_LANDSCAPE /* The following are optional depending on your hardware */ //#define GDISP_NEED_SCROLL TRUE -//#define GDISP_NEED_CONTROL TRUE /* GDISP fonts to include */ #define GDISP_INCLUDE_FONT_UI2 TRUE -- cgit v1.2.3