mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-11-10 01:09:50 +00:00
Merge with develop
--HG-- branch : compatibility-develop
This commit is contained in:
commit
082704210b
2 changed files with 15 additions and 1 deletions
|
@ -1517,7 +1517,14 @@ namespace NLGUI
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case HTML_BR:
|
case HTML_BR:
|
||||||
addString(ucstring ("\n"));
|
{
|
||||||
|
endParagraph();
|
||||||
|
|
||||||
|
// insert zero-width-space (0x200B) to prevent removal of empty lines
|
||||||
|
ucstring tmp;
|
||||||
|
tmp.fromUtf8("\xe2\x80\x8b");
|
||||||
|
addString(tmp);
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
case HTML_BODY:
|
case HTML_BODY:
|
||||||
{
|
{
|
||||||
|
|
|
@ -1209,6 +1209,13 @@ namespace NLGUI
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
sint32 CGroupTable::getMaxUsedW() const
|
sint32 CGroupTable::getMaxUsedW() const
|
||||||
{
|
{
|
||||||
|
// Return table width if its requested by user.
|
||||||
|
// Need to do this because width of long line of text in here is calculated
|
||||||
|
// differently than final cell width in updateCoords()
|
||||||
|
// This will break tables with too narrow width set by user.
|
||||||
|
if (ForceWidthMin > 0)
|
||||||
|
return ForceWidthMin;
|
||||||
|
|
||||||
uint i;
|
uint i;
|
||||||
uint column = 0;
|
uint column = 0;
|
||||||
vector<sint32> columns;
|
vector<sint32> columns;
|
||||||
|
|
Loading…
Reference in a new issue