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

SL-17670 tweaking simplified outfit snapshot floater

master
Maxim Nikolenko 2022-08-11 15:58:53 +03:00
parent 1f53d3abbf
commit 64fefa9880
3 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
indra/newview/llfloatersimpleoutfitsnapshot.cpp
View File

@ -182,8 +182,8 @@ BOOL LLFloaterSimpleOutfitSnapshot::postBuild()
return TRUE;
}
const S32 PREVIEW_OFFSET_X = 2;
const S32 PREVIEW_OFFSET_Y = 63;
const S32 PREVIEW_OFFSET_X = 12;
const S32 PREVIEW_OFFSET_Y = 70;
void LLFloaterSimpleOutfitSnapshot::draw()
{
@ -216,7 +216,12 @@ void LLFloaterSimpleOutfitSnapshot::draw()
gl_draw_scaled_image(offset_x, offset_y,
thumbnail_w, thumbnail_h,
previewp->getThumbnailImage(), color % alpha);
#if LL_DARWIN
std::string alpha_color = getTransparencyType() == TT_ACTIVE ? "OutfitSnapshotMacMask" : "OutfitSnapshotMacMask2";
#else
std::string alpha_color = getTransparencyType() == TT_ACTIVE ? "FloaterFocusBackgroundColor" : "DkGray";
#endif
previewp->drawPreviewRect(offset_x, offset_y, LLUIColorTable::instance().getColor(alpha_color));
gGL.pushUIMatrix();

6
indra/newview/skins/default/colors.xml
View File

@ -969,4 +969,10 @@
<color
name="AddPaymentPanel"
value="0.27 0.27 0.27 1" />
<color
name="OutfitSnapshotMacMask"
value="0.115 0.115 0.115 1"/>
<color
name="OutfitSnapshotMacMask2"
value="0.1 0.1 0.1 1"/>
</colors>

18
indra/newview/skins/default/xui/en/floater_simple_outfit_snapshot.xml
View File

@ -5,7 +5,7 @@
can_minimize="true"
can_resize="false"
can_close="true"
height="315"
height="305"
layout="topleft"
name="simple_outfit_snapshot"
single_instance="true"
@ -13,24 +13,24 @@
save_rect="true"
save_visibility="false"
title="OUTFIT SNAPSHOT"
width="405">
width="351">
<ui_ctrl
layout="topleft"
name="thumbnail_placeholder"
top="18"
left="2"
width="400"
height="400"
left="22"
width="335"
height="200"
follows="top|left"/>
<button
follows="left|bottom"
height="22"
layout="topleft"
left="42"
left="29"
label="Take photo"
name="new_snapshot_btn"
bottom="-15"
width="100" />
width="90" />
<button
follows="left|bottom"
height="22"
@ -38,7 +38,7 @@
left_pad="10"
label="Save (L$[UPLOAD_COST])"
name="save_btn"
width="100" />
width="90" />
<button
follows="left|bottom"
height="22"
@ -46,5 +46,5 @@
left_pad="10"
label="Cancel"
name="cancel_btn"
width="100" />
width="90" />
</floater>