diff options
| author | richard <none@none> | 2009-10-28 11:48:10 -0700 |
|---|---|---|
| committer | richard <none@none> | 2009-10-28 11:48:10 -0700 |
| commit | bb9fe04b5fcfdb8f0f386fa4c11bcaed3dd1ddff (patch) | |
| tree | 14e7b84ea33344325b8a9c4e59ea71f66b1fcd29 /indra/llui/lltextbase.h | |
| parent | afb9df7643443f62a154f93c0f3eb39dfc218a48 (diff) | |
EXT-1949 - Viewer freezes on resizing IM window
cleaned up some rectangle tracking logic and introduced LLInlineViewSegment param block
reviewed by Leyla
Diffstat (limited to 'indra/llui/lltextbase.h')
| -rw-r--r-- | indra/llui/lltextbase.h | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/indra/llui/lltextbase.h b/indra/llui/lltextbase.h index d0787f001e..14fd786127 100644 --- a/indra/llui/lltextbase.h +++ b/indra/llui/lltextbase.h @@ -459,7 +459,17 @@ public: class LLInlineViewSegment : public LLTextSegment { public: - LLInlineViewSegment(LLView* widget, S32 start, S32 end, bool force_new_line, S32 hpad = 0, S32 vpad = 0); + struct Params : public LLInitParam::Block<Params> + { + Mandatory<LLView*> view; + Optional<bool> force_newline; + Optional<S32> left_pad, + right_pad, + bottom_pad, + top_pad; + }; + + LLInlineViewSegment(const Params& p, S32 start, S32 end); ~LLInlineViewSegment(); /*virtual*/ void getDimensions(S32 first_char, S32 num_chars, S32& width, S32& height) const; /*virtual*/ S32 getNumChars(S32 num_pixels, S32 segment_offset, S32 line_offset, S32 max_chars) const; @@ -470,8 +480,10 @@ public: /*virtual*/ void linkToDocument(class LLTextBase* editor); private: - S32 mHPad; - S32 mVPad; + S32 mLeftPad; + S32 mRightPad; + S32 mTopPad; + S32 mBottomPad; LLView* mView; bool mForceNewLine; }; |
