Ryzom
/
ryzom-core
1
1
Fork 0
Code Issues 38 Pull Requests Projects 1 Releases 1 Activity

Changed: Replace spaces by tabs

Browse Source 
--HG--
branch : develop
feature/streamed-package
kervala 5 years ago
parent ca75cc4dea
commit a8097f47d4
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File

27
code/nel/src/gui/view_text.cpp
Unescape Escape View File

@ -850,10 +850,10 @@ namespace NLGUI
prop = (char*) xmlGetProp( cur, (xmlChar*)"justification" ); prop = (char*) xmlGetProp( cur, (xmlChar*)"justification" );
if (prop) if (prop)
{ {
if (nlstricmp("clip_word", (const char *) prop) == 0) _TextMode = ClipWord; 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("dont_clip_word", (const char *) prop) == 0) _TextMode = DontClipWord;
else if (nlstricmp("justified", (const char *) prop) == 0) _TextMode = Justified; else if (nlstricmp("justified", (const char *) prop) == 0) _TextMode = Justified;
else if (nlstricmp("centered", (const char *) prop) == 0) _TextMode = Centered; else if (nlstricmp("centered", (const char *) prop) == 0) _TextMode = Centered;
else nlwarning("<CViewText::parse> bad text mode"); else nlwarning("<CViewText::parse> bad text mode");
} }
@ -1094,11 +1094,12 @@ namespace NLGUI
else else
mouseIn= isIn(x,y); mouseIn= isIn(x,y);
// if the mouse cursor is in the clip area // if the mouse cursor is in the clip area
if(mouseIn) { if(mouseIn)
rVR.drawRotFlipBitmap (_RenderLayer, _XReal, _YReal, _WReal, 1, 0, false, rVR.getBlankTextureId(), CRGBA(200,200,200,255)); {
rVR.drawRotFlipBitmap (_RenderLayer, _XReal, _YReal+_HReal, _WReal, 1, 0, false, rVR.getBlankTextureId(), CRGBA(200,200,200,255)); rVR.drawRotFlipBitmap (_RenderLayer, _XReal, _YReal, _WReal, 1, 0, false, rVR.getBlankTextureId(), CRGBA(200,200,200,255));
rVR.drawRotFlipBitmap (_RenderLayer, _XReal, _YReal, 1, _HReal, 0, false, rVR.getBlankTextureId(), CRGBA(200,200,200,255)); rVR.drawRotFlipBitmap (_RenderLayer, _XReal, _YReal+_HReal, _WReal, 1, 0, false, rVR.getBlankTextureId(), CRGBA(200,200,200,255));
rVR.drawRotFlipBitmap (_RenderLayer, _XReal+_WReal, _YReal, 1, _HReal, 0, false, rVR.getBlankTextureId(), CRGBA(200,200,200,255)); rVR.drawRotFlipBitmap (_RenderLayer, _XReal, _YReal, 1, _HReal, 0, false, rVR.getBlankTextureId(), CRGBA(200,200,200,255));
rVR.drawRotFlipBitmap (_RenderLayer, _XReal+_WReal, _YReal, 1, _HReal, 0, false, rVR.getBlankTextureId(), CRGBA(200,200,200,255));
} }
} }
#endif #endif
@ -1111,7 +1112,7 @@ namespace NLGUI
return; return;
// hack: allow shadow to overflow outside parent box. // hack: allow shadow to overflow outside parent box.
// In CGroupHTML context, clip is set for row // In CGroupHTML context, clip is set for row
if (std::abs(_ShadowX) > 0) if (std::abs(_ShadowX) > 0)
{ {
ClipX -= 3; ClipX -= 3;
@ -2373,7 +2374,7 @@ namespace NLGUI
} }
// *************************************************************************** // ***************************************************************************
void CViewText::setColorRGBA(NLMISC::CRGBA col) void CViewText::setColorRGBA(NLMISC::CRGBA col)
{ {
_Color = col; _Color = col;
} }
@ -2405,7 +2406,7 @@ namespace NLGUI
if (_Lines.empty()) if (_Lines.empty())
{ {
x = 0; x = 0;
fx = 0; fx = 0;
} }
else else
{ {
@ -2543,7 +2544,7 @@ namespace NLGUI
TextContext->setOblique (_Oblique); TextContext->setOblique (_Oblique);
// find the line where the character is // find the line where the character is
// CViewRenderer &rVR = *CViewRenderer::getInstance(); // CViewRenderer &rVR = *CViewRenderer::getInstance();
uint charPos = 0; uint charPos = 0;
if (_MultiLine) if (_MultiLine)
{ {
y -= getMultiMinOffsetY() * _Scale; y -= getMultiMinOffsetY() * _Scale;

Write Preview
Loading…
Cancel
Save