Illuna-Minetest
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert 1469424 and fix wrong char position when doing mouse selection on intlGUIEditBox (#5806) 

* Revert 1469424075 and fix wrong char position when doing mouse selection on intlGUIEditBox

position should look at current line not the whole text and shift 1 character on the last line (due to \0 string delimiter)

* Finish the fix and prevent values under zero for getCursorPos which crash the program if found

* Forget to remove old comment

* fix zero to NULL

* Fix typo
master
Loïc Blot 2017-05-24 08:56:40 +02:00 committed by GitHub
parent e8fb1f79bc
commit 099624a513
1 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/intlGUIEditBox.cpp
View File

@ -29,6 +29,7 @@
// This file is part of the "Irrlicht Engine". // This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h // For conditions of distribution and use, see copyright notice in irrlicht.h
#include <util/numeric.h>
#include "intlGUIEditBox.h" #include "intlGUIEditBox.h"
#if defined(_IRR_COMPILE_WITH_GUI_) && IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR < 9 #if defined(_IRR_COMPILE_WITH_GUI_) && IRRLICHT_VERSION_MAJOR == 1 && IRRLICHT_VERSION_MINOR < 9
@ -1096,41 +1097,39 @@ s32 intlGUIEditBox::getCursorPos(s32 x, s32 y)
const u32 lineCount = (WordWrap || MultiLine) ? BrokenText.size() : 1; const u32 lineCount = (WordWrap || MultiLine) ? BrokenText.size() : 1;
core::stringw *txtLine=0; core::stringw *txtLine = NULL;
s32 startPos=0; s32 startPos = 0;
x+=3; u32 curr_line_idx = 0;
x += 3;
for (u32 i=0; i < lineCount; ++i) for (; curr_line_idx < lineCount; ++curr_line_idx) {
{ setTextRect(curr_line_idx);
setTextRect(i); if (curr_line_idx == 0 && y < CurrentTextRect.UpperLeftCorner.Y)
if (i == 0 && y < CurrentTextRect.UpperLeftCorner.Y)
y = CurrentTextRect.UpperLeftCorner.Y; y = CurrentTextRect.UpperLeftCorner.Y;
if (i == lineCount - 1 && y > CurrentTextRect.LowerRightCorner.Y ) if (curr_line_idx == lineCount - 1 && y > CurrentTextRect.LowerRightCorner.Y)
y = CurrentTextRect.LowerRightCorner.Y; y = CurrentTextRect.LowerRightCorner.Y;
// is it inside this region? // is it inside this region?
if (y >= CurrentTextRect.UpperLeftCorner.Y && y <= CurrentTextRect.LowerRightCorner.Y) if (y >= CurrentTextRect.UpperLeftCorner.Y && y <= CurrentTextRect.LowerRightCorner.Y) {
{
// we've found the clicked line // we've found the clicked line
txtLine = (WordWrap || MultiLine) ? &BrokenText[i] : &Text; txtLine = (WordWrap || MultiLine) ? &BrokenText[curr_line_idx] : &Text;
startPos = (WordWrap || MultiLine) ? BrokenTextPositions[i] : 0; startPos = (WordWrap || MultiLine) ? BrokenTextPositions[curr_line_idx] : 0;
break; break;
} }
} }
if (x < CurrentTextRect.UpperLeftCorner.X) if (x < CurrentTextRect.UpperLeftCorner.X)
x = CurrentTextRect.UpperLeftCorner.X; x = CurrentTextRect.UpperLeftCorner.X;
else if (x > CurrentTextRect.LowerRightCorner.X + 1) else if (x > CurrentTextRect.LowerRightCorner.X)
x = CurrentTextRect.LowerRightCorner.X + 1; x = CurrentTextRect.LowerRightCorner.X;
s32 idx = font->getCharacterFromPos(Text.c_str(), x - CurrentTextRect.UpperLeftCorner.X); s32 idx = font->getCharacterFromPos(txtLine->c_str(), x - CurrentTextRect.UpperLeftCorner.X);
// Special handling for last line, if we are on limits, add 1 extra shift because idx
// will be the last char, not null char of the wstring
if (curr_line_idx == lineCount - 1 && x == CurrentTextRect.LowerRightCorner.X)
idx++;
// click was on or left of the line return rangelim(idx + startPos, 0, S32_MAX);
if (idx != -1)
return idx + startPos;
// click was off the right edge of the last line, go to end.
return txtLine->size() + startPos;
} }