Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert addition of now unused LLLineEditor::mFontStyle

Browse Source
This commit is contained in:
Liru Færs
2019-10-10 11:41:58 -04:00
parent 7b6a4d76a8
commit 2f72ed2e80
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
indra/llui/lllineeditor.cpp
View File

@@ -1895,7 +1895,7 @@ void LLLineEditor::draw()
rendered_pixels_right, text_bottom, rendered_pixels_right, text_bottom,
text_color, text_color,
LLFontGL::LEFT, LLFontGL::BOTTOM, LLFontGL::LEFT, LLFontGL::BOTTOM,
mFontStyle, LLFontGL::NORMAL,
LLFontGL::NO_SHADOW, LLFontGL::NO_SHADOW,
select_left - mScrollHPos, select_left - mScrollHPos,
mMaxHPixels - ll_round(rendered_pixels_right), mMaxHPixels - ll_round(rendered_pixels_right),
@@ -1916,7 +1916,7 @@ void LLLineEditor::draw()
rendered_pixels_right, text_bottom, rendered_pixels_right, text_bottom,
tmp_color, tmp_color,
LLFontGL::LEFT, LLFontGL::BOTTOM, LLFontGL::LEFT, LLFontGL::BOTTOM,
mFontStyle, LLFontGL::NORMAL,
LLFontGL::NO_SHADOW, LLFontGL::NO_SHADOW,
select_right - mScrollHPos - rendered_text, select_right - mScrollHPos - rendered_text,
mMaxHPixels - ll_round(rendered_pixels_right), mMaxHPixels - ll_round(rendered_pixels_right),
@@ -1931,7 +1931,7 @@ void LLLineEditor::draw()
rendered_pixels_right, text_bottom, rendered_pixels_right, text_bottom,
text_color, text_color,
LLFontGL::LEFT, LLFontGL::BOTTOM, LLFontGL::LEFT, LLFontGL::BOTTOM,
mFontStyle, LLFontGL::NORMAL,
LLFontGL::NO_SHADOW, LLFontGL::NO_SHADOW,
S32_MAX, S32_MAX,
mMaxHPixels - ll_round(rendered_pixels_right), mMaxHPixels - ll_round(rendered_pixels_right),
@@ -1945,7 +1945,7 @@ void LLLineEditor::draw()
rendered_pixels_right, text_bottom, rendered_pixels_right, text_bottom,
text_color, text_color,
LLFontGL::LEFT, LLFontGL::BOTTOM, LLFontGL::LEFT, LLFontGL::BOTTOM,
mFontStyle, LLFontGL::NORMAL,
LLFontGL::NO_SHADOW, LLFontGL::NO_SHADOW,
S32_MAX, S32_MAX,
mMaxHPixels - ll_round(rendered_pixels_right), mMaxHPixels - ll_round(rendered_pixels_right),
@@ -1987,7 +1987,7 @@ void LLLineEditor::draw()
mGLFont->render(mText, getCursor(), (F32)(cursor_left + UI_LINEEDITOR_CURSOR_THICKNESS / 2), text_bottom, mGLFont->render(mText, getCursor(), (F32)(cursor_left + UI_LINEEDITOR_CURSOR_THICKNESS / 2), text_bottom,
tmp_color, tmp_color,
LLFontGL::LEFT, LLFontGL::BOTTOM, LLFontGL::LEFT, LLFontGL::BOTTOM,
mFontStyle, LLFontGL::NORMAL,
LLFontGL::NO_SHADOW, LLFontGL::NO_SHADOW,
1); 1);
} }
@@ -2013,7 +2013,7 @@ void LLLineEditor::draw()
label_color, label_color,
LLFontGL::LEFT, LLFontGL::LEFT,
LLFontGL::BOTTOM, LLFontGL::BOTTOM,
mFontStyle, LLFontGL::NORMAL,
LLFontGL::NO_SHADOW, LLFontGL::NO_SHADOW,
S32_MAX, S32_MAX,
mMaxHPixels - ll_round(rendered_pixels_right), mMaxHPixels - ll_round(rendered_pixels_right),
@@ -2038,7 +2038,7 @@ void LLLineEditor::draw()
label_color, label_color,
LLFontGL::LEFT, LLFontGL::LEFT,
LLFontGL::BOTTOM, LLFontGL::BOTTOM,
mFontStyle, LLFontGL::NORMAL,
LLFontGL::NO_SHADOW, LLFontGL::NO_SHADOW,
S32_MAX, S32_MAX,
mMaxHPixels - ll_round(rendered_pixels_right), mMaxHPixels - ll_round(rendered_pixels_right),

1
indra/llui/lllineeditor.h
View File

@@ -315,7 +315,6 @@ protected:
LLViewBorder* mBorder; LLViewBorder* mBorder;
const LLFontGL* mGLFont; const LLFontGL* mGLFont;
U8 mFontStyle = LLFontGL::NORMAL;
S32 mMaxLengthBytes; // Max length of the UTF8 string in bytes S32 mMaxLengthBytes; // Max length of the UTF8 string in bytes
S32 mCursorPos; // I-beam is just after the mCursorPos-th character. S32 mCursorPos; // I-beam is just after the mCursorPos-th character.
S32 mScrollHPos; // Horizontal offset from the start of mText. Used for scrolling. S32 mScrollHPos; // Horizontal offset from the start of mText. Used for scrolling.