From f4ade875a3516eaa9f1a32e92fd18ef5b6cf9205 Mon Sep 17 00:00:00 2001 From: Nimetu Date: Sat, 19 Jan 2019 22:26:36 +0200 Subject: [PATCH] Added: CViewText centered text mode option. --HG-- branch : develop --- code/nel/include/nel/gui/view_text.h | 2 +- code/nel/src/gui/view_text.cpp | 27 +++++++++++++++++++++++++-- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/code/nel/include/nel/gui/view_text.h b/code/nel/include/nel/gui/view_text.h index 5fe86dee5..195db5a62 100644 --- a/code/nel/include/nel/gui/view_text.h +++ b/code/nel/include/nel/gui/view_text.h @@ -37,7 +37,7 @@ namespace NLGUI class CViewText : public CViewBase { public: - enum TTextMode { ClipWord, DontClipWord, Justified }; + enum TTextMode { ClipWord, DontClipWord, Justified, Centered }; public: DECLARE_UI_CLASS(CViewText) diff --git a/code/nel/src/gui/view_text.cpp b/code/nel/src/gui/view_text.cpp index e991d8170..d04d3df2e 100644 --- a/code/nel/src/gui/view_text.cpp +++ b/code/nel/src/gui/view_text.cpp @@ -312,6 +312,9 @@ namespace NLGUI case Justified: return "justified"; break; + + case Centered: + return "centered"; } return ""; @@ -522,6 +525,9 @@ namespace NLGUI else if( value == "justified" ) _TextMode = Justified; + else + if( value == "centered" ) + _TextMode = Centered; return true; } @@ -716,6 +722,10 @@ namespace NLGUI case Justified: just = "justified"; break; + + case Centered: + just = "centered"; + break; } xmlSetProp( node, BAD_CAST "justification", BAD_CAST just.c_str() ); @@ -843,6 +853,7 @@ namespace NLGUI if (nlstricmp("clip_word", (const char *) prop) == 0) _TextMode = ClipWord; else if (nlstricmp("dont_clip_word", (const char *) prop) == 0) _TextMode = DontClipWord; else if (nlstricmp("justified", (const char *) prop) == 0) _TextMode = Justified; + else if (nlstricmp("centered", (const char *) prop) == 0) _TextMode = Centered; else nlwarning(" bad text mode"); } @@ -1195,7 +1206,18 @@ namespace NLGUI { CLine &currLine = *_Lines[i]; // current x position - float px = (float) (_XReal * _Scale + ((i==0) ? (sint)_FirstLineX : 0)); + float px = (float) (_XReal * _Scale + ((i==0) ? _FirstLineX : 0.f)); + + // Center line to computed maximum line width (_WReal) + // + // Does not give most accurate result when _WReal is much smaller than parent, + // but _WReal also defines mouseover hotspot/tooltip area. + // + // May not work correctly in CGroupParagraph (multiple text elements). + // + if (_TextMode == Centered) + px += (float)(_WReal * _Scale - (currLine.getWidth() + (i == 0 ? _FirstLineX : 0.f)) )/ 2.f; + // draw each words of the line for(uint k = 0; k < currLine.getNumWords(); ++k) { @@ -2039,6 +2061,7 @@ namespace NLGUI switch(_TextMode) { case ClipWord: updateTextContextMultiLine(nMaxWidth); break; + case Centered: // fallthru to DontClipWord case DontClipWord: updateTextContextMultiLineJustified(nMaxWidth, false); break; case Justified: updateTextContextMultiLineJustified(nMaxWidth, true); break; } @@ -2869,7 +2892,7 @@ namespace NLGUI return (sint32)ceilf(_FontHeight / _Scale); } // If we can't clip the words, return the size of the largest word - else if ((_TextMode == DontClipWord) || (_TextMode == Justified)) + else if ((_TextMode == DontClipWord) || (_TextMode == Justified) || (_TextMode == Centered)) { NL3D::UTextContext *TextContext = CViewRenderer::getTextContext(_FontName); TextContext->setHotSpot (UTextContext::BottomLeft);