aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--demos/modules/gwin/list/gfxconf.h266
-rw-r--r--demos/modules/gwin/list/main.c62
-rw-r--r--releases.txt1
3 files changed, 264 insertions, 65 deletions
diff --git a/demos/modules/gwin/list/gfxconf.h b/demos/modules/gwin/list/gfxconf.h
index 40b509ff..7c4d6fae 100644
--- a/demos/modules/gwin/list/gfxconf.h
+++ b/demos/modules/gwin/list/gfxconf.h
@@ -1,64 +1,222 @@
-/*
- * 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.
*
- * 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_TEXT TRUE
-#define GDISP_NEED_CONVEX_POLYGON TRUE
-
-/* GDISP fonts to include */
-#define GDISP_INCLUDE_FONT_UI2 TRUE
-
-/* Features for the GWIN subsystem. */
-#define GWIN_NEED_WINDOWMANAGER TRUE
-#define GWIN_NEED_WIDGET TRUE
-#define GWIN_NEED_LIST TRUE
-
-/* Features for the GINPUT subsystem. */
-#define GINPUT_NEED_MOUSE 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 FALSE
+#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 FALSE
+#define GDISP_NEED_QUERY FALSE
+#define GDISP_NEED_MULTITHREAD FALSE
+#define GDISP_NEED_STREAMING FALSE
+#define GDISP_NEED_TEXT TRUE
+ #define GDISP_NEED_ANTIALIAS FALSE
+ #define GDISP_NEED_UTF8 FALSE
+ #define GDISP_NEED_TEXT_KERNING FALSE
+ #define GDISP_INCLUDE_FONT_UI1 FALSE
+ #define GDISP_INCLUDE_FONT_UI2 FALSE
+ #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 TRUE
+ #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 FALSE
+ #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 FALSE
+
+#define GWIN_NEED_CONSOLE FALSE
+ #define GWIN_CONSOLE_USE_HISTORY FALSE
+ #define GWIN_CONSOLE_HISTORY_AVERAGING FALSE
+ #define GWIN_CONSOLE_HISTORY_ATCREATE FALSE
+ #define GWIN_CONSOLE_USE_BASESTREAM FALSE
+ #define GWIN_CONSOLE_USE_FLOAT FALSE
+#define GWIN_NEED_GRAPH FALSE
+
+#define GWIN_NEED_WIDGET TRUE
+ #define GWIN_NEED_LABEL TRUE
+ #define GWIN_NEED_BUTTON FALSE
+ #define GWIN_BUTTON_LAZY_RELEASE FALSE
+ #define GWIN_NEED_SLIDER FALSE
+ #define GWIN_NEED_CHECKBOX FALSE
+ #define GWIN_NEED_IMAGE FALSE
+ #define GWIN_NEED_IMAGE_ANIMATION FALSE
+ #define GWIN_NEED_RADIO FALSE
+ #define GWIN_NEED_LIST TRUE
+ #define GWIN_NEED_LIST_IMAGES TRUE
+ #define GWIN_NEED_PROGRESSBAR FALSE
+
+
+///////////////////////////////////////////////////////////////////////////
+// GEVENT //
+///////////////////////////////////////////////////////////////////////////
+#define GFX_USE_GEVENT FALSE
+
+#define GEVENT_ASSERT_NO_RESOURCE FALSE
+#define GEVENT_MAXIMUM_SIZE 32
+#define GEVENT_MAX_SOURCE_LISTENERS 32
+
+
+///////////////////////////////////////////////////////////////////////////
+// GTIMER //
+///////////////////////////////////////////////////////////////////////////
+#define GFX_USE_GTIMER FALSE
+
+#define GTIMER_THREAD_PRIORITY HIGH_PRIORITY
+#define GTIMER_THREAD_WORKAREA_SIZE 2048
+
+
+///////////////////////////////////////////////////////////////////////////
+// GQUEUE //
+///////////////////////////////////////////////////////////////////////////
+#define GFX_USE_GQUEUE FALSE
+
+#define GQUEUE_NEED_ASYNC FALSE
+#define GQUEUE_NEED_GSYNC FALSE
+#define GQUEUE_NEED_FSYNC 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
+
+
+///////////////////////////////////////////////////////////////////////////
+// GADC //
+///////////////////////////////////////////////////////////////////////////
+#define GFX_USE_GADC FALSE
+
+#define GADC_MAX_LOWSPEED_DEVICES 4
+
+
+///////////////////////////////////////////////////////////////////////////
+// GAUDIN //
+///////////////////////////////////////////////////////////////////////////
+#define GFX_USE_GAUDIN FALSE
+
+
+///////////////////////////////////////////////////////////////////////////
+// GAUDOUT //
+///////////////////////////////////////////////////////////////////////////
+#define GFX_USE_GAUDOUT 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/list/main.c b/demos/modules/gwin/list/main.c
index 03d99d58..fca5f018 100644
--- a/demos/modules/gwin/list/main.c
+++ b/demos/modules/gwin/list/main.c
@@ -29,8 +29,9 @@
#include "gfx.h"
-static GListener gl;
-static GHandle ghList1;
+GListener gl;
+GHandle ghLabel1, ghLabel2;
+GHandle ghList1, ghList2;
static void createWidgets(void) {
GWidgetInit wi;
@@ -39,17 +40,38 @@ static void createWidgets(void) {
wi.customDraw = 0;
wi.customParam = 0;
wi.customStyle = 0;
+ wi.g.show = TRUE;
+
+ // Create the label for the first list
+ wi.g.width = 150; wi.g.height = 20; wi.g.x = 10, wi.g.y = 80;
+ wi.text = "List 1: Default";
+ ghLabel1 = gwinLabelCreate(NULL, &wi);
+
+ // Create the label for the second list
+ wi.g.width = 150; wi.g.height = 20; wi.g.x = 165, wi.g.y = 80;
+ wi.text = "List 2: Smooth scrolling";
+ ghLabel1 = gwinLabelCreate(NULL, &wi);
+
+ // Make list widgets invisible by default as they would issue
+ // a re-render at every time an item is added
wi.g.show = FALSE;
- // Apply the list parameters
- wi.g.width = 100;
- wi.g.height = 80;
- wi.g.y = 10;
+ // The first list widget
+ wi.g.width = 150;
+ wi.g.height = 100;
+ wi.g.y = 100;
wi.g.x = 10;
- wi.text = "List Name";
-
- // Create the actual list
+ wi.text = "Name of list 1";
ghList1 = gwinListCreate(0, &wi, FALSE);
+
+ // The second list widget
+ wi.g.width = 150;
+ wi.g.height = 100;
+ wi.g.y = 100;
+ wi.g.x = 165;
+ wi.text = "Name of list 2";
+ ghList2 = gwinListCreate(0, &wi, FALSE);
+ gwinListSetScroll(ghList2, scrollSmooth);
}
int main(void) {
@@ -59,7 +81,7 @@ int main(void) {
gfxInit();
// Set the widget defaults
- gwinSetDefaultFont(gdispOpenFont("UI2"));
+ gwinSetDefaultFont(gdispOpenFont("DejaVuSans12_AA"));
gwinSetDefaultStyle(&WhiteWidgetStyle, FALSE);
gdispClear(White);
@@ -73,7 +95,7 @@ int main(void) {
geventListenerInit(&gl);
gwinAttachListener(&gl);
- // Add some items to the list widget
+ // Add some items to the first list widget
gwinListAddItem(ghList1, "Item 0", FALSE);
gwinListAddItem(ghList1, "Item 1", FALSE);
gwinListAddItem(ghList1, "Item 2", FALSE);
@@ -89,7 +111,25 @@ int main(void) {
gwinListAddItem(ghList1, "Item 12", FALSE);
gwinListAddItem(ghList1, "Item 13", FALSE);
+ // Add some items to the second list widget
+ gwinListAddItem(ghList2, "Item 0", FALSE);
+ gwinListAddItem(ghList2, "Item 1", FALSE);
+ gwinListAddItem(ghList2, "Item 2", FALSE);
+ gwinListAddItem(ghList2, "Item 3", FALSE);
+ gwinListAddItem(ghList2, "Item 4", FALSE);
+ gwinListAddItem(ghList2, "Item 5", FALSE);
+ gwinListAddItem(ghList2, "Item 6", FALSE);
+ gwinListAddItem(ghList2, "Item 7", FALSE);
+ gwinListAddItem(ghList2, "Item 8", FALSE);
+ gwinListAddItem(ghList2, "Item 9", FALSE);
+ gwinListAddItem(ghList2, "Item 10", FALSE);
+ gwinListAddItem(ghList2, "Item 11", FALSE);
+ gwinListAddItem(ghList2, "Item 12", FALSE);
+ gwinListAddItem(ghList2, "Item 13", FALSE);
+
+ // Make all the lists visible
gwinSetVisible(ghList1, TRUE);
+ gwinSetVisible(ghList2, TRUE);
while(1) {
// Get an Event
diff --git a/releases.txt b/releases.txt
index 505bc763..2cf47a9a 100644
--- a/releases.txt
+++ b/releases.txt
@@ -11,6 +11,7 @@ DEPRECATE: TDISP module removed
FIX: Console does not execute gwinPrintf() anymore if not visible
FEATURE: Added gwinGetColor() and gwinGetBgColor()
FEATURE: Console does now have an optional buffer (GWIN_CONSOLE_USE_HISTORY)
+FEATURE: Added smooth scrolling to list widget
*** changes after 1.9 ***