From 432e243e1aca565ea19091d39f1ff33056ce4075 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Thu, 29 Oct 2009 15:37:25 -0700
Subject: EXT-1352 Add image art to floater backgrounds. Implemented
"legacy_header_height" hack to account for new art being 25 pixels tall
instead of legacy 18 pixels -- it auto-sizes the floaters to be taller. Made
all floaters have resize handles, just disable and make invisible if unused.
This simplifies the floater construction logic. Floater header height now
lives in floater.xml, not as a global saved setting. Reviewed with Richard.
---
indra/llui/llfloater.h | 8 ++++++++
1 file changed, 8 insertions(+)
(limited to 'indra/llui/llfloater.h')
diff --git a/indra/llui/llfloater.h b/indra/llui/llfloater.h
index 2fdaecf59a..afdc4ccf00 100644
--- a/indra/llui/llfloater.h
+++ b/indra/llui/llfloater.h
@@ -125,6 +125,8 @@ public:
save_rect,
save_visibility,
can_dock;
+ Optional<S32> header_height,
+ legacy_header_height; // HACK see initFromXML()
Optional<CommitCallbackParam> open_callback,
close_callback;
@@ -209,6 +211,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);
@@ -302,7 +305,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
@@ -340,6 +346,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;
--
cgit v1.2.3