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 - * Copyright (c) 2012, 2013, Andrew Hannam aka inmarket +/** + * 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. * - * 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 nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * 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 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 +//#define GFX_USE_OS_CHIBIOS TRUE +//#define GFX_USE_OS_WIN32 TRUE +//#define GFX_USE_OS_LINUX TRUE +//#define GFX_USE_OS_OSX TRUE -/* 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 // +/////////////////////////////////////////////////////////////////////////// +#define GFX_USE_GDISP TRUE -/* GDISP fonts to include */ -#define GDISP_INCLUDE_FONT_UI2 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 -/* Features for the GWIN subsystem. */ -#define GWIN_NEED_WINDOWMANAGER TRUE -#define GWIN_NEED_WIDGET TRUE -#define GWIN_NEED_LIST TRUE +#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 -/* Features for the GINPUT subsystem. */ -#define GINPUT_NEED_MOUSE TRUE #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/gfxconf.example.h b/gfxconf.example.h index fdc91aad..bb644e22 100644 --- a/gfxconf.example.h +++ b/gfxconf.example.h @@ -141,6 +141,7 @@ #define GWIN_NEED_IMAGE_ANIMATION FALSE #define GWIN_NEED_RADIO FALSE #define GWIN_NEED_LIST FALSE + #define GWIN_NEED_LIST_IMAGES FALSE #define GWIN_NEED_PROGRESSBAR FALSE #define GWIN_NEED_FRAME FALSE diff --git a/include/gwin/list.h b/include/gwin/list.h index 4052f53f..cfe6aeb2 100644 --- a/include/gwin/list.h +++ b/include/gwin/list.h @@ -46,22 +46,30 @@ typedef struct GEventGWinList { typedef struct GListObject { GWidgetObject w; + #if GINPUT_NEED_MOUSE + coord_t start_mouse_x; + coord_t start_mouse_y; + coord_t last_mouse_y; + #endif #if GINPUT_NEED_TOGGLE uint16_t t_up; uint16_t t_dn; #endif int cnt; // Number of items currently in the list (quicker than counting each time) - int top; // The element at the top of the visible list area + int top; // Viewing offset in pixels from the top of the list gfxQueueASync list_head; // The list of items } GListObject; /** * @brief Enum to change the behaviour of the scroll bar * - * @note This might be used with @p gwinListSetScroll() + * @note Used with @p gwinListSetScroll() + * @note @p scrollAlways always show the scrollbar + * @note @p scrollAuto show the scrollbar when there are more items on the list then fit on the screen + * @note @p scrollSmooth enable touch screen smooth scrolling */ -typedef enum scroll_t { scrollAlways, scrollAuto } scroll_t; +typedef enum scroll_t { scrollAlways, scrollAuto, scrollSmooth } scroll_t; #ifdef __cplusplus extern "C" { @@ -97,7 +105,7 @@ GHandle gwinGListCreate(GDisplay *g, GListObject *widget, GWidgetInit *pInit, bo /** * @brief Change the behaviour of the scroll bar * - * @note Current possible values: @p scrollAlways and @p scrollAuto + * @note Current possible values: @p scrollAlways, @p scrollAuto and @p scrollSmooth * * @param[in] gh The widget handle (must be a list handle) * @param[in] flag The behaviour to be set 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 *** diff --git a/src/gdisp/gdisp.c b/src/gdisp/gdisp.c index bb642b30..13f2eda2 100644 --- a/src/gdisp/gdisp.c +++ b/src/gdisp/gdisp.c @@ -2764,7 +2764,8 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co #if GDISP_NEED_ANTIALIAS && GDISP_HARDWARE_PIXELREAD static void drawcharline(int16_t x, int16_t y, uint8_t count, uint8_t alpha, void *state) { #define GD ((GDisplay *)state) - if (y < GD->t.clipy0 || y >= GD->t.clipy1 || x < GD->t.clipx0 || x+count > GD->t.clipx1) return; + if (y < GD->t.clipy0 || y >= GD->t.clipy1) + return; if (alpha == 255) { GD->p.x = x; GD->p.y = y; GD->p.x1 = x+count-1; GD->p.color = GD->t.color; hline_clip(GD); @@ -2780,7 +2781,8 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co #else static void drawcharline(int16_t x, int16_t y, uint8_t count, uint8_t alpha, void *state) { #define GD ((GDisplay *)state) - if (y < GD->t.clipy0 || y >= GD->t.clipy1 || x < GD->t.clipx0 || x+count > GD->t.clipx1) return; + if (y < GD->t.clipy0 || y >= GD->t.clipy1) + return; if (alpha > 0x80) { // A best approximation when using anti-aliased fonts but we can't actually draw them anti-aliased GD->p.x = x; GD->p.y = y; GD->p.x1 = x+count-1; GD->p.color = GD->t.color; hline_clip(GD); @@ -2792,7 +2794,8 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co #if GDISP_NEED_ANTIALIAS static void fillcharline(int16_t x, int16_t y, uint8_t count, uint8_t alpha, void *state) { #define GD ((GDisplay *)state) - if (y < GD->t.clipy0 || y >= GD->t.clipy1 || x < GD->t.clipx0 || x+count > GD->t.clipx1) return; + if (y < GD->t.clipy0 || y >= GD->t.clipy1) + return; if (alpha == 255) { GD->p.color = GD->t.color; } else { diff --git a/src/gwin/list.c b/src/gwin/list.c index 1662277d..0f09e86e 100644 --- a/src/gwin/list.c +++ b/src/gwin/list.c @@ -21,11 +21,13 @@ #include "gwin/class_gwin.h" #include +#include // user for the default drawing routine -#define SCROLLWIDTH 16 // the border from the scroll buttons to the frame -#define ARROW 10 // arrow side length -#define TEXTGAP 1 // extra vertical padding for text +#define SCROLLWIDTH 16 // the border from the scroll buttons to the frame +#define ARROW 10 // arrow side length +#define HORIZONTAL_PADDING 5 // extra horizontal padding for text +#define VERTICAL_PADDING 2 // extra vertical padding for text // Macro's to assist in data type conversions #define gh2obj ((GListObject *)gh) @@ -38,6 +40,7 @@ #define GLIST_FLG_MULTISELECT (GWIN_FIRST_CONTROL_FLAG << 0) #define GLIST_FLG_HASIMAGES (GWIN_FIRST_CONTROL_FLAG << 1) #define GLIST_FLG_SCROLLALWAYS (GWIN_FIRST_CONTROL_FLAG << 2) +#define GLIST_FLG_SCROLLSMOOTH (GWIN_FIRST_CONTROL_FLAG << 3) // Flags on a ListItem. #define GLIST_FLG_SELECTED 0x0001 @@ -90,11 +93,21 @@ static void gwinListDefaultDraw(GWidgetObject* gw, void* param) { #endif ps = (gw->g.flags & GWIN_FLG_ENABLED) ? &gw->pstyle->enabled : &gw->pstyle->disabled; - iheight = gdispGetFontMetric(gw->g.font, fontHeight) + TEXTGAP; + iheight = gdispGetFontMetric(gw->g.font, fontHeight) + VERTICAL_PADDING; x = 1; // the scroll area - if ((gw2obj->cnt > (gw->g.height-2) / iheight) || (gw->g.flags & GLIST_FLG_SCROLLALWAYS)) { + if (gw->g.flags & GLIST_FLG_SCROLLSMOOTH) { + iwidth = gw->g.width - 2 - 4; + if (gw2obj->cnt > 0) { + int max_scroll_value = gw2obj->cnt * iheight - gw->g.height-2; + if (max_scroll_value > 0) { + int bar_height = (gw->g.height-2) * (gw->g.height-2) / (gw2obj->cnt * iheight); + gdispGFillArea(gw->g.display, gw->g.x + gw->g.width-4, gw->g.y + 1, 2, gw->g.height-1, gw->pstyle->background); + gdispGFillArea(gw->g.display, gw->g.x + gw->g.width-4, gw->g.y + gw2obj->top * ((gw->g.height-2)-bar_height) / max_scroll_value, 2, bar_height, ps->edge); + } + } + } else if ((gw2obj->cnt > (gw->g.height-2) / iheight) || (gw->g.flags & GLIST_FLG_SCROLLALWAYS)) { iwidth = gw->g.width - (SCROLLWIDTH+3); gdispGFillArea(gw->g.display, gw->g.x+iwidth+2, gw->g.y+1, SCROLLWIDTH, gw->g.height-2, gdispBlendColor(ps->fill, gw->pstyle->background, 128)); gdispGDrawLine(gw->g.display, gw->g.x+iwidth+1, gw->g.y+1, gw->g.x+iwidth+1, gw->g.y+gw->g.height-2, ps->edge); @@ -118,40 +131,75 @@ static void gwinListDefaultDraw(GWidgetObject* gw, void* param) { // Find the top item - for (qi = gfxQueueASyncPeek(&gw2obj->list_head), i = 0; i < gw2obj->top && qi; qi = gfxQueueASyncNext(qi), i++); + for (qi = gfxQueueASyncPeek(&gw2obj->list_head), i = iheight - 1; i < gw2obj->top && qi; qi = gfxQueueASyncNext(qi), i+=iheight); + + // the list frame + gdispGDrawBox(gw->g.display, gw->g.x, gw->g.y, gw->g.width, gw->g.height, ps->edge); + + // Set the clipping region so we do not override the frame. + gdispGSetClip(gw->g.display, gw->g.x+1, gw->g.y+1, gw->g.width-2, gw->g.height-2); // Draw until we run out of room or items - for (y=1; y+iheight < gw->g.height-1 && qi; qi = gfxQueueASyncNext(qi), y += iheight) { + for (y = 1-(gw2obj->top%iheight); y < gw->g.height-2 && qi; qi = gfxQueueASyncNext(qi), y += iheight) { fill = (qi2li->flags & GLIST_FLG_SELECTED) ? ps->fill : gw->pstyle->background; + gdispGFillArea(gw->g.display, gw->g.x+1, gw->g.y+y, iwidth, iheight, fill); #if GWIN_NEED_LIST_IMAGES if ((gw->g.flags & GLIST_FLG_HASIMAGES)) { // Clear the image area - gdispGFillArea(gw->g.display, gw->g.x+1, gw->g.y+y, x-1, iheight, fill); if (qi2li->pimg && gdispImageIsOpen(qi2li->pimg)) { // Calculate which image - sy = (qi2li->flags & GLIST_FLG_SELECTED) ? 0 : (iheight-TEXTGAP); + sy = (qi2li->flags & GLIST_FLG_SELECTED) ? 0 : (iheight-VERTICAL_PADDING); if (!(gw->g.flags & GWIN_FLG_ENABLED)) - sy += 2*(iheight-TEXTGAP); + sy += 2*(iheight-VERTICAL_PADDING); while (sy > qi2li->pimg->height) - sy -= iheight-TEXTGAP; + sy -= iheight-VERTICAL_PADDING; // Draw the image gdispImageSetBgColor(qi2li->pimg, fill); - gdispGImageDraw(gw->g.display, qi2li->pimg, gw->g.x+1, gw->g.y+y, iheight-TEXTGAP, iheight-TEXTGAP, 0, sy); + gdispGImageDraw(gw->g.display, qi2li->pimg, gw->g.x+1, gw->g.y+y, iheight-VERTICAL_PADDING, iheight-VERTICAL_PADDING, 0, sy); } } #endif - gdispGFillStringBox(gw->g.display, gw->g.x+x, gw->g.y+y, iwidth, iheight, qi2li->text, gw->g.font, ps->text, fill, justifyLeft); + gdispGFillStringBox(gw->g.display, gw->g.x+x+HORIZONTAL_PADDING, gw->g.y+y, iwidth-HORIZONTAL_PADDING, iheight, qi2li->text, gw->g.font, ps->text, fill, justifyLeft); } // Fill any remaining item space if (y < gw->g.height-1) gdispGFillArea(gw->g.display, gw->g.x+1, gw->g.y+y, iwidth, gw->g.height-1-y, gw->pstyle->background); - - // the list frame - gdispGDrawBox(gw->g.display, gw->g.x, gw->g.y, gw->g.width, gw->g.height, ps->edge); } #if GINPUT_NEED_MOUSE + static void MouseSelect(GWidgetObject* gw, coord_t x, coord_t y) { + const gfxQueueASyncItem* qi; + int item, i; + coord_t iheight; + + iheight = gdispGetFontMetric(gw->g.font, fontHeight) + VERTICAL_PADDING; + + // Handle click over the list area + item = (gw2obj->top + y) / iheight; + + if (item < 0 || item >= gw2obj->cnt) + return; + + for(qi = gfxQueueASyncPeek(&gw2obj->list_head), i = 0; qi; qi = gfxQueueASyncNext(qi), i++) { + if ((gw->g.flags & GLIST_FLG_MULTISELECT)) { + if (item == i) { + qi2li->flags ^= GLIST_FLG_SELECTED; + break; + } + } else { + if (item == i) + qi2li->flags |= GLIST_FLG_SELECTED; + else + qi2li->flags &=~ GLIST_FLG_SELECTED; + } + } + + _gwidgetRedraw(&gw->g); + sendListEvent(gw, item); + + } + // a mouse down has occurred over the list area static void MouseDown(GWidgetObject* gw, coord_t x, coord_t y) { const gfxQueueASyncItem* qi; @@ -159,20 +207,32 @@ static void gwinListDefaultDraw(GWidgetObject* gw, void* param) { coord_t iheight; (void) x; - iheight = gdispGetFontMetric(gw->g.font, fontHeight) + TEXTGAP; - pgsz = (gw->g.height-2)/iheight; + gw2obj->start_mouse_x = x; + gw2obj->start_mouse_y = y; + gw2obj->last_mouse_y = y; + + iheight = gdispGetFontMetric(gw->g.font, fontHeight) + VERTICAL_PADDING; + pgsz = (gw->g.height-2); if (pgsz < 1) pgsz = 1; + // For smooth scrolling, scrolling is done in the MouseMove and selection is done on MouseUp + if (gw->g.flags & GLIST_FLG_SCROLLSMOOTH) + return; + // Handle click over the scroll bar - if (gw2obj->cnt > pgsz && x >= gw->g.width-(SCROLLWIDTH+2)) { + if (gw2obj->cnt > (pgsz / iheight) && x >= gw->g.width-(SCROLLWIDTH+2)) { if (y < 2*ARROW) { if (gw2obj->top > 0) { - gw2obj->top--; + gw2obj->top -= iheight; + if (gw2obj->top < 0) + gw2obj->top = 0; _gwidgetRedraw(&gw->g); } } else if (y >= gw->g.height - 2*ARROW) { - if (gw2obj->top < gw2obj->cnt - pgsz) { - gw2obj->top++; + if (gw2obj->top < gw2obj->cnt * iheight - pgsz) { + gw2obj->top += iheight; + if (gw2obj->top > gw2obj->cnt * iheight - pgsz) + gw2obj->top = gw2obj->cnt * iheight - pgsz; _gwidgetRedraw(&gw->g); } } else if (y < gw->g.height/2) { @@ -184,39 +244,51 @@ static void gwinListDefaultDraw(GWidgetObject* gw, void* param) { _gwidgetRedraw(&gw->g); } } else { - if (gw2obj->top < gw2obj->cnt - pgsz) { - if (gw2obj->top < gw2obj->cnt - 2*pgsz) + if (gw2obj->top < gw2obj->cnt * iheight - pgsz) { + if (gw2obj->top < gw2obj->cnt * iheight - 2*pgsz) gw2obj->top += pgsz; else - gw2obj->top = gw2obj->cnt - pgsz; + gw2obj->top = gw2obj->cnt * iheight - pgsz; _gwidgetRedraw(&gw->g); } } return; } - // Handle click over the list area - item = gw2obj->top + y / iheight; + MouseSelect(gw, x, y); + } - if (item < 0 || item >= gw2obj->cnt) - return; + static void MouseUp(GWidgetObject* gw, coord_t x, coord_t y) { + // Only act when we are a smooth scrolling list + if (!(gw->g.flags & GLIST_FLG_SCROLLSMOOTH)) + return; - for(qi = gfxQueueASyncPeek(&gw2obj->list_head), i = 0; qi; qi = gfxQueueASyncNext(qi), i++) { - if ((gw->g.flags & GLIST_FLG_MULTISELECT)) { - if (item == i) { - qi2li->flags ^= GLIST_FLG_SELECTED; - break; - } - } else { - if (item == i) - qi2li->flags |= GLIST_FLG_SELECTED; - else - qi2li->flags &=~ GLIST_FLG_SELECTED; - } - } + // Only allow selection when we did not scroll + if (abs(gw2obj->start_mouse_x - x) > 4 || abs(gw2obj->start_mouse_y - y) > 4) + return; - _gwidgetRedraw(&gw->g); - sendListEvent(gw, item); + MouseSelect(gw, x, y); + } + + static void MouseMove(GWidgetObject* gw, coord_t x, coord_t y) { + int iheight, oldtop; + (void) x; + + if (!(gw->g.flags & GLIST_FLG_SCROLLSMOOTH)) return; + + if (gw2obj->last_mouse_y != y) { + oldtop = gw2obj->top; + iheight = gdispGetFontMetric(gw->g.font, fontHeight) + VERTICAL_PADDING; + + gw2obj->top -= y - gw2obj->last_mouse_y; + if (gw2obj->top >= gw2obj->cnt * iheight - (gw->g.height-2)) + gw2obj->top = gw2obj->cnt * iheight - (gw->g.height-2) - 1; + if (gw2obj->top < 0) + gw2obj->top = 0; + gw2obj->last_mouse_y = y; + if (oldtop != gw2obj->top) + _gwidgetRedraw(&gw->g); + } } #endif @@ -295,8 +367,8 @@ static const gwidgetVMT listVMT = { #if GINPUT_NEED_MOUSE { MouseDown, - 0, - 0, + MouseUp, + MouseMove, }, #endif #if GINPUT_NEED_TOGGLE @@ -340,14 +412,18 @@ void gwinListSetScroll(GHandle gh, scroll_t flag) { if (gh->vmt != (gwinVMT *)&listVMT) return; + ((GListObject*)gh)->w.g.flags &=~(GLIST_FLG_SCROLLSMOOTH | GLIST_FLG_SCROLLALWAYS); switch (flag) { case scrollAlways: ((GListObject*)gh)->w.g.flags |= GLIST_FLG_SCROLLALWAYS; break; case scrollAuto: - ((GListObject*)gh)->w.g.flags &=~ GLIST_FLG_SCROLLALWAYS; break; + + case scrollSmooth: + ((GListObject*)gh)->w.g.flags |= GLIST_FLG_SCROLLSMOOTH; + break; } }