diff options
| author | Richard Linden <none@none> | 2012-02-07 22:50:49 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-02-07 22:50:49 -0800 |
| commit | f27ea1aff738f3222c782a7fac5b9172fc3cf67c (patch) | |
| tree | f840d3a912aeafdea76f482cdcf292f8088d9b5b /indra/llui/llview.h | |
| parent | 4e08461f8ad23fb75ca8587c781c2cf65351b1ab (diff) | |
EXP-1181 WIP as a designer I would like to specify default floater positions using realtive coordinates
fixed build
moved conversion funcs to llwindow.cpp as they work on all platforms
refactored translateintorect to take overlap as parameter
Diffstat (limited to 'indra/llui/llview.h')
| -rw-r--r-- | indra/llui/llview.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llview.h b/indra/llui/llview.h index f1fac5f69c..de2fab963b 100644 --- a/indra/llui/llview.h +++ b/indra/llui/llview.h @@ -370,7 +370,7 @@ public: virtual void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE); virtual void translate( S32 x, S32 y ); void setOrigin( S32 x, S32 y ) { mRect.translate( x - mRect.mLeft, y - mRect.mBottom ); } - BOOL translateIntoRect( const LLRect& constraint, BOOL allow_partial_outside ); + BOOL translateIntoRect( const LLRect& constraint, S32 min_overlap_pixels = S32_MAX); BOOL translateIntoRectWithExclusion( const LLRect& inside, const LLRect& exclude, BOOL allow_partial_outside ); void centerWithin(const LLRect& bounds); |