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

Merge branch 'DRTVWR-565-maint-P' of https://bitbucket.org/lindenlab/viewer

master
Ansariel 2022-08-12 23:48:39 +02:00
parent 278adc482f ee3fe6f66a
commit bbd779bce5
8 changed files with 43 additions and 17 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();

5
indra/newview/llpanelpresetscamerapulldown.cpp
View File

@ -128,7 +128,10 @@ void LLPanelPresetsCameraPulldown::onRowClick(const LLSD& user_data)
LL_DEBUGS() << "selected '" << name << "'" << LL_ENDL;
LLFloaterCamera::switchToPreset(name);
setVisible(FALSE);
// Scroll grabbed focus, drop it to prevent selection of parent menu
setFocus(FALSE);
setVisible(FALSE);
}
else
{

3
indra/newview/llpanelpresetspulldown.cpp
View File

@ -120,6 +120,9 @@ void LLPanelPresetsPulldown::onRowClick(const LLSD& user_data)
LL_DEBUGS() << "selected '" << name << "'" << LL_ENDL;
LLPresetsManager::getInstance()->loadPreset(PRESETS_GRAPHIC, name);
// Scroll grabbed focus, drop it to prevent selection of parent menu
setFocus(FALSE);
setVisible(FALSE);
}
else

2
indra/newview/llpanelpulldown.cpp
View File

@ -51,6 +51,7 @@ void LLPanelPulldown::onMouseEnter(S32 x, S32 y, MASK mask)
/*virtual*/
void LLPanelPulldown::onTopLost()
{
setFocus(FALSE); // drop focus to prevent transfer to parent
setVisible(FALSE);
}
@ -113,6 +114,7 @@ void LLPanelPulldown::draw()
if (alpha == 0.f)
{
setFocus(FALSE); // drop focus to prevent transfer to parent
setVisible(FALSE);
}
}

16
indra/newview/llviewerwindow.cpp
View File

@ -2425,21 +2425,24 @@ void LLViewerWindow::initWorldUI()
// Force gFloaterTools to initialize
LLFloaterReg::getInstance("build");
// Status bar
LLPanel* status_bar_container = getRootView()->getChild<LLPanel>("status_bar_container");
gStatusBar = new LLStatusBar(status_bar_container->getLocalRect());
// <FS:Ansariel> Undo weird LL messing around with main view
//gStatusBar->setFollows(FOLLOWS_LEFT | FOLLOWS_TOP | FOLLOWS_RIGHT);
gStatusBar->setFollowsAll();
gStatusBar->setShape(status_bar_container->getLocalRect());
// sync bg color with menu bar
gStatusBar->setBackgroundColor( gMenuBarView->getBackgroundColor().get() );
// add InBack so that gStatusBar won't be drawn over menu
status_bar_container->addChildInBack(gStatusBar);
status_bar_container->setVisible(TRUE);
// <FS:Ansariel> Undo weird LL messing around with main view
//status_bar_container->addChildInBack(gStatusBar, 2/*tab order, after menu*/);
status_bar_container->addChildInBack(gStatusBar);
status_bar_container->setVisible(TRUE);
// <FS:Zi> Make navigation bar part of the UI
// // Navigation bar
// LLPanel* nav_bar_container = getRootView()->getChild<LLPanel>("topinfo_bar_container");
// LLView* nav_bar_container = getRootView()->getChild<LLView>("nav_bar_container");
// LLNavigationBar* navbar = LLNavigationBar::getInstance();
// navbar->setShape(nav_bar_container->getLocalRect());
@ -2447,6 +2450,11 @@ void LLViewerWindow::initWorldUI()
// nav_bar_container->addChild(navbar);
// nav_bar_container->setVisible(TRUE);
//// Navigation bar is outside visible area, expand status_bar_container to show it
//S32 new_height = nav_bar_container->getRect().getHeight() + status_bar_container->getRect().getHeight();
//S32 new_width = status_bar_container->getRect().getWidth();
//status_bar_container->reshape(new_width, new_height, TRUE);
// if (!gSavedSettings.getBOOL("ShowNavbarNavigationPanel"))
// {
// navbar->setVisible(FALSE);

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

@ -1272,6 +1272,12 @@
<color
name="PanelGray"
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"/>
<color
name="PerformanceMid"
value="1 0.8 0 1" />

1
indra/newview/skins/default/xui/en/floater_how_to.xml
View File

@ -3,7 +3,6 @@
legacy_header_height="18"
can_resize="false"
can_minimize="false"
can_close="true"
height="525"
layout="topleft"
name="floater_how_to"

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>