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

Resize and adjust thumbnail calcs to remove some hardcoding.

master
Beq 2025-02-20 17:17:55 +00:00
parent 0ea50f2cab
commit 658a06532a
4 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
indra/newview/llfloatersnapshot.cpp
View File

@ -217,16 +217,19 @@ void LLFloaterSnapshotBase::ImplBase::updateLayout(LLFloaterSnapshotBase* floate
if (!mSkipReshaping && !floaterp->isMinimized())
{
LLView* controls_container = floaterp->getChild<LLView>("controls_container");
constexpr S32 THUMB_HEIGHT_LARGE = 420;
constexpr S32 THUMB_HEIGHT_SMALL = 124;
constexpr S32 THUMB_WIDTH_SMALL = 216;
if (mAdvanced)
{
LLRect cc_rect = controls_container->getRect();
floaterp->reshape(floater_width, 483);
floaterp->reshape(floater_width, floaterp->getOriginalHeight());
controls_container->setRect(cc_rect);
controls_container->updateBoundingRect();
thumbnail_placeholder->reshape(panel_width, 420);
thumbnail_placeholder->reshape(panel_width, THUMB_HEIGHT_LARGE);
LLRect tn_rect = thumbnail_placeholder->getRect();
tn_rect.setLeftTopAndSize(215, floaterp->getRect().getHeight() - 30, tn_rect.getWidth(), tn_rect.getHeight());
@ -240,15 +243,15 @@ void LLFloaterSnapshotBase::ImplBase::updateLayout(LLFloaterSnapshotBase* floate
{
LLRect cc_rect = controls_container->getRect();
floaterp->reshape(floater_width, 613);
floaterp->reshape(floater_width,floaterp->getOriginalHeight()+THUMB_HEIGHT_SMALL);
controls_container->setRect(cc_rect);
controls_container->updateBoundingRect();
thumbnail_placeholder->reshape(216, 124);
thumbnail_placeholder->reshape(THUMB_WIDTH_SMALL, THUMB_HEIGHT_SMALL);
LLRect tn_rect = thumbnail_placeholder->getRect();
tn_rect.setLeftTopAndSize(5, floaterp->getRect().getHeight() - 30, 216, 124);
tn_rect.setLeftTopAndSize(5, floaterp->getRect().getHeight() - 30, THUMB_WIDTH_SMALL, THUMB_HEIGHT_SMALL);
thumbnail_placeholder->setRect(tn_rect);
thumbnail_placeholder->updateBoundingRect();
@ -1207,7 +1210,7 @@ bool LLFloaterSnapshot::postBuild()
//getChild<LLComboBox>("local_size_combo")->selectNthItem(8);
//getChild<LLComboBox>("local_format_combo")->selectNthItem(0);
// </FS:Ansariel>
mOriginalHeight = getRect().getHeight();
impl->mPreviewHandle = previewp->getHandle();
previewp->setContainer(this);
impl->updateControls(this);

3
indra/newview/llfloatersnapshot.h
View File

@ -67,8 +67,9 @@ public:
class ImplBase;
friend class ImplBase;
ImplBase* impl;
S32 getOriginalHeight() const { return mOriginalHeight; }
protected:
S32 mOriginalHeight;
LLUICtrl* mThumbnailPlaceholder;
LLUICtrl *mRefreshBtn, *mRefreshLabel;
LLUICtrl *mSucceessLblPanel, *mFailureLblPanel;

2
indra/newview/skins/default/xui/en/floater_flickr.xml
View File

@ -27,7 +27,7 @@
tab_height="21"
tab_position="top"
top="7"
height="565"
height="570"
follows="all"
halign="center">
<panel

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

@ -5,7 +5,7 @@
can_minimize="true"
can_resize="false"
can_close="true"
height="480"
height="510"
layout="topleft"
name="Snapshot"
single_instance="true"
@ -91,7 +91,7 @@
left="10"
label="Refresh"
name="new_snapshot_btn"
top_pad="0"
top_pad="10"
width="167" />
<button
follows="left|top"