frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Fixed deleting the last character of a string menu item in insert mode

Browse Source
This commit is contained in:
Klaus Schmidinger 2006-07-30 09:09:30 +02:00
parent cdad4a6b4e
commit cacd58d036
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -1452,6 +1452,7 @@ Udo Richter <udo_richter@gmx.de>
for adding "-fPIC" to the compiler options in Make.config.template when compiling for adding "-fPIC" to the compiler options in Make.config.template when compiling
plugins plugins
for reporting a missing '--vfat' in the vdr.1 man page for reporting a missing '--vfat' in the vdr.1 man page
for fixing deleting the last character of a string menu item in insert mode
Sven Kreiensen <svenk@kammer.uni-hannover.de> Sven Kreiensen <svenk@kammer.uni-hannover.de>
for his help in keeping 'channels.conf.terr' up to date for his help in keeping 'channels.conf.terr' up to date

2
HISTORY
View File

@ -4842,3 +4842,5 @@ Video Disk Recorder Revision History
- Increased the APIVERSION to allow plugins that relied on the cStatus::MsgSetVolume() - Increased the APIVERSION to allow plugins that relied on the cStatus::MsgSetVolume()
bug to react properly (suggested by Stefan Huelswitt). bug to react properly (suggested by Stefan Huelswitt).
- Fixed cDevice::ToggleMute() (thanks to Christoph Haubrich). - Fixed cDevice::ToggleMute() (thanks to Christoph Haubrich).
- Fixed deleting the last character of a string menu item in insert mode (thanks
to Udo Richter).

6
menuitems.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: menuitems.c 1.46 2006/07/23 09:42:17 kls Exp $ * $Id: menuitems.c 1.47 2006/07/30 09:09:30 kls Exp $
*/ */
#include "menuitems.h" #include "menuitems.h"
@ -313,7 +313,7 @@ void cMenuEditStrItem::Set(void)
SetValue(buf); SetValue(buf);
return; return;
} }
width -= font->Width('>'); // assuming '<' and '>' have the same with width -= font->Width('>'); // assuming '<' and '>' have the same width
int w = 0; int w = 0;
int i = 0; int i = 0;
int l = strlen(buf); int l = strlen(buf);
@ -395,6 +395,8 @@ eOSState cMenuEditStrItem::ProcessKey(eKeys Key)
if (strlen(value) > 1) { if (strlen(value) > 1) {
if (!insert || pos < int(strlen(value)) - 1) if (!insert || pos < int(strlen(value)) - 1)
memmove(value + pos, value + pos + 1, strlen(value) - pos); memmove(value + pos, value + pos + 1, strlen(value) - pos);
else if (insert && pos == int(strlen(value)) - 1)
value[pos] = ' '; // in insert mode, deleting the last character replaces it with a blank to keep the cursor position
// reduce position, if we removed the last character // reduce position, if we removed the last character
if (pos == int(strlen(value))) if (pos == int(strlen(value)))
pos--; pos--;