Commit 992af48f authored by bitplane's avatar bitplane

Fixed (new?) bug in edit box where typing characters over selected text didn't disable selection.

Font tool now compiles again (only tested in windows)

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2445 dfc29bdd-3216-0410-991c-e03cc46cb475
parent d0229edd
......@@ -245,6 +245,7 @@ bool CGUIEditBox::processKey(const SEvent& event)
if ( event.KeyInput.Char == '\\' )
{
inputChar(event.KeyInput.Char);
return true;
}
switch(event.KeyInput.Key)
......@@ -437,6 +438,7 @@ bool CGUIEditBox::processKey(const SEvent& event)
if (MultiLine)
{
inputChar(L'\n');
return true;
}
else
{
......@@ -658,7 +660,7 @@ bool CGUIEditBox::processKey(const SEvent& event)
default:
inputChar(event.KeyInput.Char);
break;
return true;
}
// Set new text markers
......@@ -1293,6 +1295,7 @@ void CGUIEditBox::inputChar(wchar_t c)
}
breakText();
sendGuiEvent(EGET_EDITBOX_CHANGED);
calculateScrollPos();
}
......
......@@ -364,7 +364,7 @@ inline u32 getTextureSizeFromSurfaceSize(u32 size)
{
// turn mip-mapping off
bool b = Device->getVideoDriver()->getTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS);
currentImages[currentImage] = Device->getVideoDriver()->createImageFromData((video::ECOLOR_FORMAT)cformat, core::dimension2d<s32>(textureWidth,texHeight), (void*)lpBits);
currentImages[currentImage] = Device->getVideoDriver()->createImageFromData((video::ECOLOR_FORMAT)cformat, core::dimension2d<u32>(textureWidth,texHeight), (void*)lpBits);
Device->getVideoDriver()->setTextureCreationFlag(video::ETCF_CREATE_MIP_MAPS,b);
}
else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment