mangavalk/lcdproc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allow wrapping slider menu items with <= 4 keys (M. Dolze)

Browse Source
This commit is contained in:
marschap
2007-10-04 17:15:41 +00:00
parent 6a6b44778c
commit e55dc82402
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+3 -1
View File
@@ -12,7 +12,7 @@ v.0.5dev (ongoing development)
* glk driver: bignum support fixed * glk driver: bignum support fixed
* update local snprintf to the last one, which is GPL * update local snprintf to the last one, which is GPL
- server core: cleanup - remove unnecessary cruft - server core: cleanup - remove unnecessary cruft
* server core: refactor renderin code * server core: refactor rendering code
+ LCDd: config options TitleSpeed= and Heartbeat= + LCDd: config options TitleSpeed= and Heartbeat=
* overhauled CwLnx driver (Dave Platt) * overhauled CwLnx driver (Dave Platt)
* overhauled picolcd driver (Nicu Pavel) * overhauled picolcd driver (Nicu Pavel)
@@ -27,6 +27,8 @@ v.0.5dev (ongoing development)
+ key support for hd44780/lcd2usb (M. Dolze) + key support for hd44780/lcd2usb (M. Dolze)
+ option Priority for NoritakeVFD (idea: Richard Muratti) + option Priority for NoritakeVFD (idea: Richard Muratti)
* overhauled NoritakeVFD driver (idea: Richard Muratti) * overhauled NoritakeVFD driver (idea: Richard Muratti)
* allow wrapping slider menu items with <= 4 keys (M. Dolze)
* a bit more Doxygen-ation
v.0.5.2 v.0.5.2
* fix switching on/off the Load screen in lcdproc client using the menu * fix switching on/off the Load screen in lcdproc client using the menu
server/menuitem.c
+11
View File
@@ -991,6 +991,14 @@ MenuResult menuitem_process_input_slider(MenuItem *item, MenuToken token, const
item->successor_id, MENURESULT_CLOSE); item->successor_id, MENURESULT_CLOSE);
case MENUTOKEN_UP: case MENUTOKEN_UP:
case MENUTOKEN_RIGHT: case MENUTOKEN_RIGHT:
/* Wrap slider around if max value is reached.
* Note: The max value is actually reached,
* because of min(maxvalue, value + stepsize) below.
* Wrapping then happens on the next key press.
*/
if ((!extended) && (item->data.slider.value == item->data.slider.maxvalue))
item->data.slider.value = item->data.slider.minvalue;
else
item->data.slider.value = min(item->data.slider.maxvalue, item->data.slider.value = min(item->data.slider.maxvalue,
item->data.slider.value + item->data.slider.stepsize); item->data.slider.value + item->data.slider.stepsize);
if (item->event_func) if (item->event_func)
@@ -998,6 +1006,9 @@ MenuResult menuitem_process_input_slider(MenuItem *item, MenuToken token, const
return MENURESULT_NONE; return MENURESULT_NONE;
case MENUTOKEN_DOWN: case MENUTOKEN_DOWN:
case MENUTOKEN_LEFT: case MENUTOKEN_LEFT:
if ((!extended) && item->data.slider.value == item->data.slider.minvalue))
item->data.slider.value = item->data.slider.maxvalue;
else
item->data.slider.value = max(item->data.slider.minvalue, item->data.slider.value = max(item->data.slider.minvalue,
item->data.slider.value - item->data.slider.stepsize); item->data.slider.value - item->data.slider.stepsize);
if (item->event_func) if (item->event_func)