livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PE merge.

meow-7.2.2
Tofu Linden 2010-02-27 11:55:29 +00:00
parent 28bdead9e5 68dcd596e5
commit 6388ae033d
3 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
indra/newview/llsyswellwindow.cpp
View File

@ -211,22 +211,25 @@ void LLSysWellWindow::reshapeWindow()
// it includes height from floater top to list top and from floater bottom and list bottom
static S32 parent_list_delta_height = getRect().getHeight() - mMessageList->getRect().getHeight();
S32 notif_list_height = mMessageList->getItemsRect().getHeight() + 2 * mMessageList->getBorderWidth();
LLRect curRect = getRect();
S32 new_window_height = notif_list_height + parent_list_delta_height;
if (new_window_height > MAX_WINDOW_HEIGHT)
if (isDocked()) // Don't reshape undocked Well window. See EXT-5715.
{
new_window_height = MAX_WINDOW_HEIGHT;
}
S32 newY = curRect.mTop + new_window_height - curRect.getHeight();
S32 newWidth = curRect.getWidth() < MIN_WINDOW_WIDTH ? MIN_WINDOW_WIDTH
S32 notif_list_height = mMessageList->getItemsRect().getHeight() + 2 * mMessageList->getBorderWidth();
LLRect curRect = getRect();
S32 new_window_height = notif_list_height + parent_list_delta_height;
if (new_window_height > MAX_WINDOW_HEIGHT)
{
new_window_height = MAX_WINDOW_HEIGHT;
}
S32 newY = curRect.mTop + new_window_height - curRect.getHeight();
S32 newWidth = curRect.getWidth() < MIN_WINDOW_WIDTH ? MIN_WINDOW_WIDTH
: curRect.getWidth();
curRect.setLeftTopAndSize(curRect.mLeft, newY, newWidth, new_window_height);
reshape(curRect.getWidth(), curRect.getHeight(), TRUE);
setRect(curRect);
curRect.setLeftTopAndSize(curRect.mLeft, newY, newWidth, new_window_height);
reshape(curRect.getWidth(), curRect.getHeight(), TRUE);
setRect(curRect);
}
// update notification channel state
// update on a window reshape is important only when a window is visible and docked

16
indra/newview/skins/default/xui/en/panel_landmarks.xml
View File

@ -10,10 +10,10 @@
border="false"
background_visible="true"
bg_alpha_color="DkGray2"
follows="left|top|right|bottom">
follows="all">
<accordion
follows="left|top|right|bottom"
height="368"
follows="all"
height="360"
layout="topleft"
left="0"
name="landmarks_accordion"
@ -27,7 +27,7 @@
allow_multi_select="true"
border="false"
bottom="0"
follows="left|top|right|bottom"
follows="all"
height="126"
left="0"
mouse_opaque="true"
@ -43,7 +43,7 @@
allow_multi_select="true"
border="false"
bottom="0"
follows="left|top|right|bottom"
follows="all"
height="126"
left="0"
mouse_opaque="true"
@ -59,7 +59,7 @@
allow_multi_select="true"
border="false"
bottom="0"
follows="left|top|right|bottom"
follows="all"
height="126"
left="0"
mouse_opaque="true"
@ -75,8 +75,8 @@
allow_multi_select="true"
border="false"
bottom="0"
follows="left|top|right|bottom"
height="120"
follows="all"
height="126"
left="0"
mouse_opaque="true"
name="library_list"

4
indra/newview/skins/default/xui/en/panel_place_profile.xml
View File

@ -174,7 +174,7 @@
<panel
bg_alpha_color="DkGray2"
follows="left|top|right"
height="532"
height="540"
layout="topleft"
left="0"
min_height="300"
@ -318,7 +318,7 @@
width="268" />
<accordion
follows="all"
height="230"
height="223"
layout="topleft"
left="0"
name="advanced_info_accordion"