Skip to content
Snippets Groups Projects
Commit 6875b617 authored by Rob Swindell's avatar Rob Swindell :speech_balloon:
Browse files

input() method was off-by-one on the string input x-coordinate w/ WIN_NOBRDR

parent deaee157
No related branches found
No related tags found
1 merge request!463MRC mods by Codefenix (2024-10-20)
Hide whitespace changes
Inline Side-by-side
Showing
with 8 additions and 7 deletions
src/uifc/uifc32.c
+ 8
− 7
View file @ 6875b617
...@@ -1875,6 +1875,7 @@ int uinput(uifc_winmode_t mode, int left, int top, const char *inprompt, char *s ...@@ -1875,6 +1875,7 @@ int uinput(uifc_winmode_t mode, int left, int top, const char *inprompt, char *s
int width; int width;
int height=3; int height=3;
int i,plen,slen,j; int i,plen,slen,j;
int offset;
int iwidth; int iwidth;
int l; int l;
char *prompt; char *prompt;
...@@ -1900,10 +1901,13 @@ int uinput(uifc_winmode_t mode, int left, int top, const char *inprompt, char *s ...@@ -1900,10 +1901,13 @@ int uinput(uifc_winmode_t mode, int left, int top, const char *inprompt, char *s
prompt=strdup(inprompt==NULL ? "":inprompt); prompt=strdup(inprompt==NULL ? "":inprompt);
plen=strlen(prompt); plen=strlen(prompt);
if(!plen) if(mode & WIN_NOBRDR)
slen=2+hbrdrsize; offset = 3;
else if(!plen)
offset = 2;
else else
slen=4+hbrdrsize; offset = 4;
slen = hbrdrsize + offset;
width=plen+slen+max; width=plen+slen+max;
if(width>(s_right-s_left+1)) if(width>(s_right-s_left+1))
...@@ -2018,10 +2022,7 @@ int uinput(uifc_winmode_t mode, int left, int top, const char *inprompt, char *s ...@@ -2018,10 +2022,7 @@ int uinput(uifc_winmode_t mode, int left, int top, const char *inprompt, char *s
if(api->bottomline != NULL) if(api->bottomline != NULL)
api->bottomline(WIN_COPY|WIN_CUT|WIN_PASTE); api->bottomline(WIN_COPY|WIN_CUT|WIN_PASTE);
textattr(api->lclr|(api->bclr<<4)); textattr(api->lclr|(api->bclr<<4));
if(!plen) i=ugetstr(s_left+left+plen+offset,s_top+top+tbrdrwidth,iwidth,str,max,kmode,NULL);
i=ugetstr(s_left+left+2,s_top+top+tbrdrwidth,iwidth,str,max,kmode,NULL);
else
i=ugetstr(s_left+left+plen+4,s_top+top+tbrdrwidth,iwidth,str,max,kmode,NULL);
if(mode&WIN_SAV) if(mode&WIN_SAV)
vmem_puttext(s_left+left,s_top+top,s_left+left+width+1 vmem_puttext(s_left+left,s_top+top,s_left+left+width+1
,s_top+top+height,save_buf); ,s_top+top+height,save_buf);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment