renamed LLLayoutStack::idle to LLLayoutStack::updateClass
converted mWorldViewPlaceholder to a LLHandle<LLView> improved layout of panel_bottomtray reviewed by Jamesmeow-7.2.2
parent
4eb72a12a2
commit
2bc97bd68a
|
|
@ -790,7 +790,7 @@ void LLLayoutStack::calcMinExtents()
|
|||
// we might still need to call updateLayout during UI draw phase, in case UI elements
|
||||
// are resizing themselves dynamically
|
||||
//static
|
||||
void LLLayoutStack::idle()
|
||||
void LLLayoutStack::updateClass()
|
||||
{
|
||||
for (LLInstanceTracker::instance_iter it = beginInstances(); it != endInstances(); ++it)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@ public:
|
|||
void updatePanelAutoResize(const std::string& panel_name, BOOL auto_resize);
|
||||
|
||||
|
||||
static void idle();
|
||||
static void updateClass();
|
||||
|
||||
protected:
|
||||
LLLayoutStack(const Params&);
|
||||
|
|
|
|||
|
|
@ -455,7 +455,7 @@ void LLSideTray::onToggleCollapse()
|
|||
|
||||
void LLSideTray::reflectCollapseChange()
|
||||
{
|
||||
setPanelRect();
|
||||
updateSidetrayVisibility();
|
||||
|
||||
if(mCollapsed)
|
||||
{
|
||||
|
|
@ -475,7 +475,7 @@ void LLSideTray::arrange()
|
|||
{
|
||||
static LLSideTray::Params sidetray_params(LLUICtrlFactory::getDefaultParams<LLSideTray>());
|
||||
|
||||
setPanelRect();
|
||||
updateSidetrayVisibility();
|
||||
|
||||
LLRect ctrl_rect;
|
||||
ctrl_rect.setLeftTopAndSize(0,
|
||||
|
|
@ -637,7 +637,7 @@ LLPanel* LLSideTray::showPanel (const std::string& panel_name, const LLSD& para
|
|||
static const S32 fake_offset = 132;
|
||||
static const S32 fake_top_offset = 18;
|
||||
|
||||
void LLSideTray::setPanelRect ()
|
||||
void LLSideTray::updateSidetrayVisibility()
|
||||
{
|
||||
// set visibility of parent container based on collapsed state
|
||||
if (getParent())
|
||||
|
|
|
|||
|
|
@ -134,9 +134,6 @@ public:
|
|||
|
||||
void reshape (S32 width, S32 height, BOOL called_from_parent = TRUE);
|
||||
|
||||
void resetPanelRect ();
|
||||
|
||||
|
||||
protected:
|
||||
LLSideTrayTab* getTab (const std::string& name);
|
||||
|
||||
|
|
@ -147,7 +144,7 @@ protected:
|
|||
|
||||
void toggleTabButton (LLSideTrayTab* tab);
|
||||
|
||||
void setPanelRect ();
|
||||
void updateSidetrayVisibility();
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1406,7 +1406,7 @@ void LLViewerWindow::initBase()
|
|||
getRootView()->addChild(main_view);
|
||||
|
||||
// placeholder widget that controls where "world" is rendered
|
||||
mWorldViewPlaceholder = main_view->getChildView("world_view_rect");
|
||||
mWorldViewPlaceholder = main_view->getChildView("world_view_rect")->getHandle();
|
||||
|
||||
// Constrain floaters to inside the menu and status bar regions.
|
||||
gFloaterView = getRootView()->getChild<LLFloaterView>("Floater View");
|
||||
|
|
@ -2329,7 +2329,7 @@ void LLViewerWindow::updateUI()
|
|||
static std::string last_handle_msg;
|
||||
|
||||
// animate layout stacks so we have up to date rect for world view
|
||||
LLLayoutStack::idle();
|
||||
LLLayoutStack::updateClass();
|
||||
|
||||
updateWorldViewRect();
|
||||
|
||||
|
|
@ -2839,9 +2839,9 @@ void LLViewerWindow::updateWorldViewRect(bool use_full_window)
|
|||
// start off using whole window to render world
|
||||
LLRect new_world_rect = mWindowRect;
|
||||
|
||||
if (use_full_window == false)
|
||||
if (use_full_window == false && mWorldViewPlaceholder.get())
|
||||
{
|
||||
new_world_rect = mWorldViewPlaceholder->calcScreenRect();
|
||||
new_world_rect = mWorldViewPlaceholder.get()->calcScreenRect();
|
||||
// clamp to at least a 1x1 rect so we don't try to allocate zero width gl buffers
|
||||
new_world_rect.mTop = llmax(new_world_rect.mTop, new_world_rect.mBottom + 1);
|
||||
new_world_rect.mRight = llmax(new_world_rect.mRight, new_world_rect.mLeft + 1);
|
||||
|
|
|
|||
|
|
@ -451,7 +451,7 @@ protected:
|
|||
|
||||
std::string mInitAlert; // Window / GL initialization requires an alert
|
||||
|
||||
LLView* mWorldViewPlaceholder; // widget that spans the portion of screen dedicated to rendering the 3d world
|
||||
LLHandle<LLView> mWorldViewPlaceholder; // widget that spans the portion of screen dedicated to rendering the 3d world
|
||||
|
||||
class LLDebugText* mDebugText; // Internal class for debug text
|
||||
|
||||
|
|
|
|||
|
|
@ -56,9 +56,9 @@
|
|||
height="28"
|
||||
layout="topleft"
|
||||
min_height="28"
|
||||
width="100"
|
||||
width="104"
|
||||
top_delta="0"
|
||||
min_width="100"
|
||||
min_width="104"
|
||||
name="speak_panel"
|
||||
user_resize="false">
|
||||
<talk_button
|
||||
|
|
|
|||
Loading…
Reference in New Issue