Skip to content
Snippets Groups Projects
Commit 23773d79 authored by Richard Linden's avatar Richard Linden
Browse files

EXP-1811 FIX Login progress floater has smaller than expected size

made minimum size reflect default size for 1024 width window of old layout stack
no way to match behavior
parent 1eae229c
No related branches found
No related tags found
No related merge requests found
...@@ -915,14 +915,16 @@ void LLFloaterUIPreview::displayFloater(BOOL click, S32 ID, bool save) ...@@ -915,14 +915,16 @@ void LLFloaterUIPreview::displayFloater(BOOL click, S32 ID, bool save)
{ {
panel->buildFromFile(path); // build it panel->buildFromFile(path); // build it
LLRect new_size = panel->getRect(); // get its rectangle LLRect new_size = panel->getRect(); // get its rectangle
panel->setOrigin(0,0); // reset its origin point so it's not offset by -left or other XUI attributes panel->setOrigin(2,2); // reset its origin point so it's not offset by -left or other XUI attributes
(*floaterp)->setTitle(path); // use the file name as its title, since panels have no guaranteed meaningful name attribute (*floaterp)->setTitle(path); // use the file name as its title, since panels have no guaranteed meaningful name attribute
panel->setUseBoundingRect(TRUE); // enable the use of its outer bounding rect (normally disabled because it's O(n) on the number of sub-elements) panel->setUseBoundingRect(TRUE); // enable the use of its outer bounding rect (normally disabled because it's O(n) on the number of sub-elements)
panel->updateBoundingRect(); // update bounding rect panel->updateBoundingRect(); // update bounding rect
LLRect bounding_rect = panel->getBoundingRect(); // get the bounding rect LLRect bounding_rect = panel->getBoundingRect(); // get the bounding rect
LLRect new_rect = panel->getRect(); // get the panel's rect LLRect new_rect = panel->getRect(); // get the panel's rect
new_rect.unionWith(bounding_rect); // union them to make sure we get the biggest one possible new_rect.unionWith(bounding_rect); // union them to make sure we get the biggest one possible
(*floaterp)->reshape(new_rect.getWidth(), new_rect.getHeight() + floater_header_size); // reshape floater to match the union rect's dimensions LLRect floater_rect = new_rect;
floater_rect.stretch(4, 4);
(*floaterp)->reshape(floater_rect.getWidth(), floater_rect.getHeight() + floater_header_size); // reshape floater to match the union rect's dimensions
panel->reshape(new_rect.getWidth(), new_rect.getHeight()); // reshape panel to match the union rect's dimensions as well (both are needed) panel->reshape(new_rect.getWidth(), new_rect.getHeight()); // reshape panel to match the union rect's dimensions as well (both are needed)
(*floaterp)->addChild(panel); // add panel as child (*floaterp)->addChild(panel); // add panel as child
(*floaterp)->openFloater(); // open floater (needed?) (*floaterp)->openFloater(); // open floater (needed?)
......
...@@ -12,43 +12,43 @@ ...@@ -12,43 +12,43 @@
height="768" height="768"
layout="topleft" layout="topleft"
left="0" left="0"
name="stack1" name="horizontal_centering"
orientation="horizontal" orientation="horizontal"
top="0" top="0"
width="1024"> width="1024">
<layout_panel <layout_panel
layout="topleft" layout="topleft"
min_width="10" min_width="10"
name="panel1" name="left"
width="150" /> width="150" />
<layout_panel <layout_panel
height="768" height="768"
layout="topleft" layout="topleft"
min_width="640" min_width="670"
name="panel2" name="center"
width="640"> width="670">
<layout_stack <layout_stack
follows="left|right|top|bottom" follows="left|right|top|bottom"
height="768" height="768"
layout="topleft" layout="topleft"
left="0" left="0"
orientation="vertical" orientation="vertical"
name="stack2" name="vertical_centering"
top="0" top="0"
width="640"> width="670">
<layout_panel <layout_panel
height="200" height="200"
layout="topleft" layout="topleft"
min_height="10" min_height="10"
name="panel3" name="panel3"
width="640" /> width="670" />
<layout_panel <layout_panel
auto_resize="false" auto_resize="false"
height="250" height="250"
layout="topleft" layout="topleft"
min_height="250" min_height="250"
name="panel4" name="panel4"
width="640"> width="670">
<icon <icon
color="LoginProgressBoxCenterColor" color="LoginProgressBoxCenterColor"
follows="left|right|bottom|top" follows="left|right|bottom|top"
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
layout="topleft" layout="topleft"
left="0" left="0"
top="0" top="0"
width="640" /> width="670" />
<text <text
follows="left|right|top" follows="left|right|top"
font="SansSerifHuge" font="SansSerifHuge"
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
name="title_text" name="title_text"
text_color="LoginProgressBoxTextColor" text_color="LoginProgressBoxTextColor"
top_delta="50" top_delta="50"
width="593" /> right="-47"/>
<text <text
follows="left|right|top" follows="left|right|top"
font="SansSerif" font="SansSerif"
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
name="progress_text" name="progress_text"
text_color="LoginProgressBoxTextColor" text_color="LoginProgressBoxTextColor"
top_pad="5" top_pad="5"
width="593" right="-47"
word_wrap="true"/> word_wrap="true"/>
<progress_bar <progress_bar
bottom="115" bottom="115"
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
name="message_text" name="message_text"
text_color="LoginProgressBoxTextColor" text_color="LoginProgressBoxTextColor"
top="145" top="145"
width="550" right="-90"
word_wrap="true"/> word_wrap="true"/>
</layout_panel> </layout_panel>
<layout_panel <layout_panel
...@@ -112,13 +112,13 @@ ...@@ -112,13 +112,13 @@
layout="topleft" layout="topleft"
min_width="10" min_width="10"
name="panel5" name="panel5"
width="640" /> width="670" />
</layout_stack> </layout_stack>
</layout_panel> </layout_panel>
<layout_panel <layout_panel
layout="topleft" layout="topleft"
min_width="10" min_width="10"
name="panel6" name="right"
width="150" /> width="150" />
</layout_stack> </layout_stack>
<button <button
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment