mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-04 02:41:19 +00:00
Code Issues Projects Releases Wiki Activity

Lua UI: Enable autoSize for single line text edit

Browse Source
This commit is contained in:
uramer 2022-06-11 22:24:20 +02:00
parent f8a6001e87
commit 6d2dcaea50
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/lua_ui/textedit.cpp
View File

@ -29,12 +29,13 @@ namespace LuaUi
Alignment vertical(propertyValue("textAlignV", Alignment::Start));
mEditBox->setTextAlign(alignmentToMyGui(horizontal, vertical));
mEditBox->setEditMultiLine(propertyValue("multiline", false));
mMultiline = propertyValue("multiline", false);
mEditBox->setEditMultiLine(mMultiline);
bool readOnly = propertyValue("readOnly", false);
mEditBox->setEditStatic(readOnly);
mAutoSize = readOnly && propertyValue("autoSize", false);
mAutoSize = (readOnly || !mMultiline) && propertyValue("autoSize", false);
// change caption last, for multiline and wordwrap to apply
mEditBox->setCaption(propertyValue("text", std::string()));
@ -67,8 +68,8 @@ namespace LuaUi
if (mAutoSize)
{
mEditBox->setSize(normalSize);
MyGUI::IntSize textSize = mEditBox->getTextSize();
normalSize.height = std::max(normalSize.height, textSize.height);
int targetHeight = mMultiline ? mEditBox->getTextSize().height : mEditBox->getFontHeight();
normalSize.height = std::max(normalSize.height, targetHeight);
}
return normalSize;
}

1
components/lua_ui/textedit.hpp
View File

@ -23,6 +23,7 @@ namespace LuaUi
void textChange(MyGUI::EditBox*);
MyGUI::EditBox* mEditBox = nullptr;
bool mMultiline;
bool mAutoSize;
};
}

2
docs/source/reference/lua-scripting/widgets/textedit.rst
View File

@ -38,7 +38,7 @@ Properties
* - autoSize
- boolean (false)
- | Automatically changes widget height to fix all the text.
| Only applies for readOnly = true.
| Only applies when readOnly = true or multiline = false.
Events
------

3
files/data/scripts/omw/mwui/textEdit.lua
View File

@ -7,7 +7,8 @@ return function(templates)
templates.textEditLine = {
type = ui.TYPE.TextEdit,
props = {
size = util.vector2(150, constants.textNormalSize),
size = util.vector2(150, 0),
autoSize = true,
textSize = constants.textNormalSize,
textColor = constants.normalColor,
multiline = false,