diff options
author | Vadim Savchuk <vsavchuk@productengine.com> | 2009-10-30 19:17:53 +0200 |
---|---|---|
committer | Vadim Savchuk <vsavchuk@productengine.com> | 2009-10-30 19:17:53 +0200 |
commit | b2526cde2393ca7d84284b254fb4f37b9e8abb5b (patch) | |
tree | 2318b3c35d1b673ba819794c094e6d8e4bad3500 /indra/llui/llfloater.h | |
parent | 2efd4f40af8df78d5b34c1449b1a99e3f570cae5 (diff) | |
parent | aae05b49308d8b5d39a1b1b62f8e6145097043b6 (diff) |
merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/llui/llfloater.h')
-rw-r--r-- | indra/llui/llfloater.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h index 3832f77adf..ef0d06a58e 100644 --- a/indra/llui/llfloater.h +++ b/indra/llui/llfloater.h @@ -126,6 +126,8 @@ public: save_visibility, save_dock_state, can_dock; + Optional<S32> header_height, + legacy_header_height; // HACK see initFromXML() Optional<CommitCallbackParam> open_callback, close_callback; @@ -210,6 +212,7 @@ public: bool isDragOnLeft() const{ return mDragOnLeft; } S32 getMinWidth() const{ return mMinWidth; } S32 getMinHeight() const{ return mMinHeight; } + S32 getHeaderHeight() const { return mHeaderHeight; } virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask); virtual BOOL handleRightMouseDown(S32 x, S32 y, MASK mask); @@ -305,7 +308,10 @@ private: void buildButtons(); BOOL offerClickToButton(S32 x, S32 y, MASK mask, EFloaterButtons index); void addResizeCtrls(); + void layoutResizeCtrls(); + void enableResizeCtrls(bool enable); void addDragHandle(); + void layoutDragHandle(); // repair layout public: // Called when floater is opened, passes mKey @@ -344,6 +350,8 @@ private: S32 mMinWidth; S32 mMinHeight; + S32 mHeaderHeight; // height in pixels of header for title, drag bar + S32 mLegacyHeaderHeight;// HACK see initFloaterXML() BOOL mMinimized; BOOL mForeground; |