oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-09-30 19:22:14 +00:00
Code Wiki Activity

Remove irr namespace (#16309)

Browse source
This commit is contained in:
Lars Müller 2025-07-09 10:35:52 +02:00 • committed by GitHub
parent 7e22c72492
commit 61551cfc3a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
381 changed files with 680 additions and 1632 deletions
Download patch file Download diff file Expand all files Collapse all files

21
irr/src/CGUIEditBox.cpp
View file

@ -21,8 +21,6 @@
numerical
*/
namespace irr
{
namespace gui
{
@ -314,7 +312,7 @@ bool CGUIEditBox::processKey(const SEvent &event)
// add the string
const c8 *p = Operator->getTextFromClipboard();
if (p) {
irr::core::stringw widep;
core::stringw widep;
core::utf8ToWString(widep, p);
if (MarkBegin == MarkEnd) {
@ -936,13 +934,13 @@ wchar_t CGUIEditBox::getCursorChar() const
}
//! Set the blinktime for the cursor. 2x blinktime is one full cycle.
void CGUIEditBox::setCursorBlinkTime(irr::u32 timeMs)
void CGUIEditBox::setCursorBlinkTime(u32 timeMs)
{
CursorBlinkTime = timeMs;
}
//! Get the cursor blinktime
irr::u32 CGUIEditBox::getCursorBlinkTime() const
u32 CGUIEditBox::getCursorBlinkTime() const
{
return CursorBlinkTime;
}
@ -950,7 +948,7 @@ irr::u32 CGUIEditBox::getCursorBlinkTime() const
bool CGUIEditBox::processMouse(const SEvent &event)
{
switch (event.MouseInput.Event) {
case irr::EMIE_LMOUSE_LEFT_UP:
case EMIE_LMOUSE_LEFT_UP:
if (Environment->hasFocus(this)) {
CursorPos = getCursorPos(event.MouseInput.X, event.MouseInput.Y);
if (MouseMarking) {
@ -961,7 +959,7 @@ bool CGUIEditBox::processMouse(const SEvent &event)
return true;
}
break;
case irr::EMIE_MOUSE_MOVED: {
case EMIE_MOUSE_MOVED: {
if (MouseMarking) {
CursorPos = getCursorPos(event.MouseInput.X, event.MouseInput.Y);
setTextMarkers(MarkBegin, CursorPos);
@ -1011,7 +1009,7 @@ bool CGUIEditBox::processMouse(const SEvent &event)
// paste from the primary selection
inputString([&] {
irr::core::stringw inserted_text;
core::stringw inserted_text;
if (!Operator)
return inserted_text;
const c8 *inserted_text_utf8 = Operator->getTextFromPrimarySelection();
@ -1349,7 +1347,7 @@ void CGUIEditBox::calculateScrollPos()
{
// get cursor position
// get cursor area
irr::u32 cursorWidth = font->getDimension(CursorChar.c_str()).Width;
u32 cursorWidth = font->getDimension(CursorChar.c_str()).Width;
core::stringw *txtLine = hasBrokenText ? &BrokenText[cursLine] : &Text;
s32 cPos = hasBrokenText ? CursorPos - BrokenTextPositions[cursLine] : CursorPos; // column
s32 cStart = font->getDimension(txtLine->subString(0, cPos).c_str()).Width; // pixels from text-start
@ -1380,9 +1378,9 @@ void CGUIEditBox::calculateScrollPos()
// calculate vertical scrolling
if (hasBrokenText) {
irr::u32 lineHeight = font->getDimension(L"A").Height + font->getKerning(L'A').Y;
u32 lineHeight = font->getDimension(L"A").Height + font->getKerning(L'A').Y;
// only up to 1 line fits?
if (lineHeight >= (irr::u32)FrameRect.getHeight()) {
if (lineHeight >= (u32)FrameRect.getHeight()) {
VScrollPos = 0;
setTextRect(cursLine);
s32 unscrolledPos = CurrentTextRect.UpperLeftCorner.Y;
@ -1486,4 +1484,3 @@ bool CGUIEditBox::acceptsIME()
}
} // end namespace gui
} // end namespace irr