summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorRick Pasetto <rick@lindenlab.com>2009-11-13 11:52:12 -0800
committerRick Pasetto <rick@lindenlab.com>2009-11-13 11:52:12 -0800
commitca630bf6bb1c7c8e04f5ed1e7d649d29d504a6e1 (patch)
treea8a15091cee67cf2f13f99b4132e18f98d662337 /indra/llui
parent230f28080cfcb6785c248340aaa42cfb29703b23 (diff)
Add background to media controls
This actually required some help from James and Richard. Thanks, guys! This adds custom-drawing of a background image underneath the icons that make up the media controls in the layout stack. In order to have this work, we had to publicize API in lllayoutstack to force relayout to calculate the size. I also did another cleanup pass ("Boy Scout Rule") that squirreled away all pertinent controls into membed variables, instead of doing a getChild() every time updateShape() is called. Readjusted a bunch of components as well.
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/lllayoutstack.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/indra/llui/lllayoutstack.h b/indra/llui/lllayoutstack.h
index 3a073fa1b2..9cbcb285dc 100644
--- a/indra/llui/lllayoutstack.h
+++ b/indra/llui/lllayoutstack.h
@@ -81,8 +81,8 @@ public:
S32 getNumPanels() { return mPanels.size(); }
void updatePanelAutoResize(const std::string& panel_name, BOOL auto_resize);
-
-
+
+ void updateLayout(BOOL force_resize = FALSE);
static void updateClass();
protected:
@@ -92,7 +92,6 @@ protected:
private:
struct LayoutPanel;
- void updateLayout(BOOL force_resize = FALSE);
void calcMinExtents();
S32 getDefaultHeight(S32 cur_height);
S32 getDefaultWidth(S32 cur_width);