diff options
| author | Richard Linden <none@none> | 2012-01-19 19:52:49 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-01-19 19:52:49 -0800 |
| commit | 29ad432c8bdc3a69c7241de28e217d27b71947d6 (patch) | |
| tree | 356b51bb2533c025ce1160e87151a36464af190e /indra/newview | |
| parent | 9de0b5ed4891dcfcb54e35d9bb0401309455d66a (diff) | |
made layoutPanels have constant user_resize and auto_resize attributes
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llchicletbar.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llsidepanelinventory.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_chiclet_bar.xml | 1 |
3 files changed, 1 insertions, 8 deletions
diff --git a/indra/newview/llchicletbar.cpp b/indra/newview/llchicletbar.cpp index a32fd307f1..f1bc51fbe7 100644 --- a/indra/newview/llchicletbar.cpp +++ b/indra/newview/llchicletbar.cpp @@ -212,8 +212,6 @@ void LLChicletBar::reshape(S32 width, S32 height, BOOL called_from_parent) { // Firstly, update layout stack to ensure we deal with correct panel sizes. { - // Set chiclet panel to be autoresized by default. - mToolbarStack->updatePanelAutoResize(PANEL_CHICLET_NAME, TRUE); // Force the updating of layout to reset panels collapse factor. mToolbarStack->updateLayout(); } diff --git a/indra/newview/llsidepanelinventory.cpp b/indra/newview/llsidepanelinventory.cpp index ccf8305c63..038b18afbd 100644 --- a/indra/newview/llsidepanelinventory.cpp +++ b/indra/newview/llsidepanelinventory.cpp @@ -217,9 +217,6 @@ BOOL LLSidepanelInventory::postBuild() { LLLayoutStack* inv_stack = getChild<LLLayoutStack>(INVENTORY_LAYOUT_STACK_NAME); - // Disable user_resize on main inventory panel by default - inv_stack->setPanelUserResize(MAIN_INVENTORY_LAYOUT_PANEL_NAME, false); - // Collapse inbox panel inv_stack->collapsePanel(getChild<LLLayoutPanel>(INBOX_LAYOUT_PANEL_NAME), true); @@ -368,9 +365,6 @@ void LLSidepanelInventory::onToggleInboxBtn() const bool inbox_expanded = inboxButton->getToggleState(); - // Enable user_resize on main inventory panel only when inbox is expanded - //inv_stack->setPanelUserResize(MAIN_INVENTORY_LAYOUT_PANEL_NAME, inbox_expanded); - // Expand/collapse the indicated panel inv_stack->collapsePanel(inboxPanel, !inbox_expanded); diff --git a/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml b/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml index 6d4008a4ed..ff0146490b 100644 --- a/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml +++ b/indra/newview/skins/default/xui/en/panel_chiclet_bar.xml @@ -27,6 +27,7 @@ min_width="95" mouse_opaque="false" name="chiclet_list_panel" + auto_resize="true" top="0" width="189"> <chiclet_panel |