Fixed progressbar in widgets demo

2 files changed, 239 insertions, 87 deletions

diff --git a/demos/modules/gwin/widgets/gfxconf.h b/demos/modules/gwin/widgets/gfxconf.h
index 3d9c7a34..ecabc27d 100644
--- a/demos/modules/gwin/widgets/gfxconf.h
+++ b/demos/modules/gwin/widgets/gfxconf.h
@@ -1,95 +1,241 @@
-/*
- * Copyright (c) 2012, 2013, Joel Bodenmann aka Tectu <joel@unormal.org>
- * Copyright (c) 2012, 2013, Andrew Hannam aka inmarket
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *    * Redistributions of source code must retain the above copyright
- *      notice, this list of conditions and the following disclaimer.
- *    * Redistributions in binary form must reproduce the above copyright
- *      notice, this list of conditions and the following disclaimer in the
- *      documentation and/or other materials provided with the distribution.
- *    * Neither the name of the <organization> nor the
- *      names of its contributors may be used to endorse or promote products
- *      derived from this software without specific prior written permission.
+/**
+ * This file has a different license to the rest of the uGFX system.
+ * You can copy, modify and distribute this file as you see fit.
+ * You do not need to publish your source modifications to this file.
+ * The only thing you are not permitted to do is to relicense it
+ * under a different license.
+ */
+
+/**
+ * Copy this file into your project directory and rename it as gfxconf.h
+ * Edit your copy to turn on the uGFX features you want to use.
+ * The values below are the defaults. You should delete anything
+ * you are leaving as default.
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * Please use spaces instead of tabs in this file.
  */
 
 #ifndef _GFXCONF_H
 #define _GFXCONF_H
 
 /* 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
-
-/* 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
-
-/* Features for the GDISP sub-system. */
-#define GDISP_NEED_VALIDATION	TRUE
-#define GDISP_NEED_CLIP			TRUE
-#define GDISP_NEED_CIRCLE		TRUE
-#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 GWIN_CONSOLE_USE_HISTORY           TRUE
-//#define GWIN_CONSOLE_HISTORY_AVERAGING     TRUE
-//#define GWIN_CONSOLE_HISTORY_ATCREATE      TRUE
-
-/* GDISP fonts to include */
-#define GDISP_INCLUDE_FONT_UI2	TRUE
-
-/* GDISP image decoders */
-#define GDISP_NEED_IMAGE_GIF		TRUE
-#define GDISP_NEED_IMAGE_BMP		TRUE
-
-/* 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_IMAGE			TRUE
-#define GWIN_NEED_RADIO			TRUE
-#define GWIN_NEED_LIST			TRUE
-#define GWIN_NEED_PROGRESSBAR	TRUE
-
-/* Features for the GFILE subsystem. */
-#define GFX_USE_GFILE				TRUE
-#define GFILE_NEED_ROMFS			TRUE
-//#define GFILE_NEED_NATIVEFS			TRUE
-
-/* Features for the GINPUT subsystem. */
-#define GINPUT_NEED_MOUSE		TRUE
-
-/* Optional parameters for various subsystems */
-#define GWIN_NEED_LIST_IMAGES	TRUE
+//#define GFX_USE_OS_CHIBIOS                         TRUE
+//#define GFX_USE_OS_WIN32                           TRUE
+//#define GFX_USE_OS_LINUX                           TRUE
+//#define GFX_USE_OS_OSX                             TRUE
+
+
+///////////////////////////////////////////////////////////////////////////
+// GDISP                                                                 //
+///////////////////////////////////////////////////////////////////////////
+#define GFX_USE_GDISP                                TRUE
+
+#define GDISP_NEED_AUTOFLUSH                         FALSE
+#define GDISP_NEED_TIMERFLUSH                        FALSE
+#define GDISP_NEED_VALIDATION                        TRUE
+#define GDISP_NEED_CLIP                              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                            FALSE
+#define GDISP_NEED_PIXELREAD                         FALSE
+#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_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_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_NATIVE                  FALSE
+    #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              FALSE
+        #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_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                                                                  //
+///////////////////////////////////////////////////////////////////////////
+#define GFX_USE_GWIN                                 TRUE
+
+#define GWIN_NEED_WINDOWMANAGER                      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_WIDGET                             TRUE
+    #define GWIN_NEED_LABEL                          TRUE
+    #define GWIN_NEED_BUTTON                         TRUE
+        #define GWIN_BUTTON_LAZY_RELEASE             FALSE
+    #define GWIN_NEED_SLIDER                         TRUE
+    #define GWIN_NEED_CHECKBOX                       TRUE
+    #define GWIN_NEED_IMAGE                          TRUE
+        #define GWIN_NEED_IMAGE_ANIMATION            TRUE
+    #define GWIN_NEED_RADIO                          TRUE
+    #define GWIN_NEED_LIST                           TRUE
+        #define GWIN_NEED_LIST_IMAGES                TRUE
+    #define GWIN_NEED_PROGRESSBAR                    TRUE
+
+
+///////////////////////////////////////////////////////////////////////////
+// GEVENT                                                                //
+///////////////////////////////////////////////////////////////////////////
+#define GFX_USE_GEVENT                               TRUE
+
+#define GEVENT_ASSERT_NO_RESOURCE                    FALSE
+#define GEVENT_MAXIMUM_SIZE                          32
+#define GEVENT_MAX_SOURCE_LISTENERS                  32
 
-#endif /* _GFXCONF_H */
 
+///////////////////////////////////////////////////////////////////////////
+// GTIMER                                                                //
+///////////////////////////////////////////////////////////////////////////
+#define GFX_USE_GTIMER                               TRUE
+
+#define GTIMER_THREAD_PRIORITY                       HIGH_PRIORITY
+#define GTIMER_THREAD_WORKAREA_SIZE                  2048
+
+
+///////////////////////////////////////////////////////////////////////////
+// GQUEUE                                                                //
+///////////////////////////////////////////////////////////////////////////
+#define GFX_USE_GQUEUE                               TRUE
+
+#define GQUEUE_NEED_ASYNC                            TRUE
+#define GQUEUE_NEED_GSYNC                            FALSE
+#define GQUEUE_NEED_FSYNC                            FALSE
+#define GQUEUE_NEED_BUFFERS                          FALSE
+
+///////////////////////////////////////////////////////////////////////////
+// GINPUT                                                                //
+///////////////////////////////////////////////////////////////////////////
+#define GFX_USE_GINPUT                               TRUE
+
+#define GINPUT_NEED_MOUSE                            TRUE
+#define GINPUT_NEED_KEYBOARD                         FALSE
+#define GINPUT_NEED_TOGGLE                           FALSE
+#define GINPUT_NEED_DIAL                             FALSE
+
+
+///////////////////////////////////////////////////////////////////////////
+// GFILE                                                                 //
+///////////////////////////////////////////////////////////////////////////
+#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_RAMFS                             FALSE
+#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 */
diff --git a/demos/modules/gwin/widgets/main.c b/demos/modules/gwin/widgets/main.c
index ae533697..a9840174 100644
--- a/demos/modules/gwin/widgets/main.c
+++ b/demos/modules/gwin/widgets/main.c
@@ -267,7 +267,6 @@ static void createWidgets(void) {
 	wi.g.x = 20; wi.text = "Progressbar 1";
 	ghProgressbar1 = gwinProgressbarCreate(0, &wi);
 	gwinProgressbarSetResolution(ghProgressbar1, 10);
-	gwinProgressbarStart(ghProgressbar1, 500);
 
 	// Console - we apply some special colors before making it visible
 	wi.g.width = ScrWidth/2-1; wi.g.height = ScrHeight/2-1;
@@ -306,6 +305,10 @@ static void setTab(GHandle tab) {
 	gwinSetVisible(ghImage1, FALSE);
 	gwinSetVisible(ghProgressbar1, FALSE);
 
+	// Stop the progress bar
+	gwinProgressbarStop(ghProgressbar1);
+	gwinProgressbarReset(ghProgressbar1);
+
 	/* Turn on widgets depending on the tab selected */
 	if (tab == ghTabButtons) {
 		gwinSetVisible(ghButton1, TRUE);
@@ -338,6 +341,9 @@ static void setTab(GHandle tab) {
 		gwinSetVisible(ghImage1, TRUE);
 	} else if (tab == ghTabProgressbar) {
 		gwinSetVisible(ghProgressbar1, TRUE);
+
+		// Start the progress bar
+		gwinProgressbarStart(ghProgressbar1, 500);
 	}
 }