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

DEV-50015 FIX Implement changes to the Buy L$ button in the top bar of the viewer

parent f6b4cd3b
No related branches found
No related tags found
No related merge requests found
......@@ -266,11 +266,12 @@ class LLFadeEventTimer : public LLEventTimer
class LLPreviewedFloater : public LLFloater
{
public:
LLPreviewedFloater(LLFloaterUIPreview* floater)
: LLFloater(LLSD()),
LLPreviewedFloater(LLFloaterUIPreview* floater, const Params& params)
: LLFloater(LLSD(), params),
mFloaterUIPreview(floater)
{
}
virtual void draw();
BOOL handleRightMouseDown(S32 x, S32 y, MASK mask);
BOOL handleToolTip(S32 x, S32 y, MASK mask);
......@@ -428,6 +429,7 @@ BOOL LLFloaterUIPreview::postBuild()
// Double-click opens the floater, for convenience
mFileList->setDoubleClickCallback(boost::bind(&LLFloaterUIPreview::onClickDisplayFloater, this, PRIMARY_FLOATER));
setDefaultBtn("display_floater");
// get pointers to buttons and link to callbacks
mLanguageSelection = main_panel_tmp->getChild<LLComboBox>("language_select_combo");
mLanguageSelection->setCommitCallback(boost::bind(&LLFloaterUIPreview::onLanguageComboSelect, this, mLanguageSelection));
......@@ -824,7 +826,11 @@ void LLFloaterUIPreview::displayFloater(BOOL click, S32 ID, bool save)
return; // ignore click (this can only happen with empty list; otherwise an item is always selected)
}
*floaterp = new LLPreviewedFloater(this);
LLFloater::Params p(LLFloater::getDefaultParams());
p.min_height=p.header_height;
p.min_width=10;
*floaterp = new LLPreviewedFloater(this, p);
if(!strncmp(path.c_str(),"floater_",8)
|| !strncmp(path.c_str(), "inspect_", 8)) // if it's a floater
......@@ -874,6 +880,8 @@ void LLFloaterUIPreview::displayFloater(BOOL click, S32 ID, bool save)
}
else // if it is a panel...
{
(*floaterp)->setCanResize(true);
const LLFloater::Params& floater_params = LLFloater::getDefaultParams();
S32 floater_header_size = floater_params.header_height;
......
......@@ -649,4 +649,9 @@ with the same filename but different name
<texture name="Progress_11" file_name="icons/Progress_11.png" preload="true" />
<texture name="Progress_12" file_name="icons/Progress_12.png" preload="true" />
<texture name="bevel_background" file_name="widgets/bevel_background.png" preload="true" scale.left="12" scale.top="15" scale.right="120" scale.bottom="2"/>
<texture name="buy_off" file_name="widgets/buy_off.png" preload="true" scale.left="2" scale.top="15" scale.right="67" scale.bottom="4"/>
<texture name="buy_over" file_name="widgets/buy_over.png" preload="true" scale.left="2" scale.top="15" scale.right="67" scale.bottom="4"/>
<texture name="buy_press" file_name="widgets/buy_press.png" preload="true" scale.left="2" scale.top="15" scale.right="67" scale.bottom="4"/>
</textures>
indra/newview/skins/default/textures/widgets/bevel_background.png

365 B

indra/newview/skins/default/textures/widgets/buy_off.png

53.5 KiB

indra/newview/skins/default/textures/widgets/buy_over.png

53.5 KiB

indra/newview/skins/default/textures/widgets/buy_press.png

53.6 KiB

......@@ -43,38 +43,40 @@
</panel.string>
<button
auto_resize="true"
halign="right"
halign="center"
font="SansSerifSmall"
follows="right|top"
image_overlay=""
image_selected="spacer35.tga"
image_unselected="spacer35.tga"
image_pressed="spacer35.tga"
height="16"
right="-230"
image_selected="bevel_background"
image_unselected="bevel_background"
image_pressed="bevel_background"
height="18"
right="-275"
label_shadow="false"
name="buycurrency"
tool_tip="My Balance"
top="3"
width="120" />
pad_left="12"
pad_right="12"
top="0"
width="40" />
<button
auto_resize="true"
halign="right"
halign="center"
font="SansSerifSmall"
follows="right|top"
image_selected="spacer35.tga"
image_unselected="spacer35.tga"
image_pressed="spacer35.tga"
height="16"
label="Buy L$"
label_color="EmphasisColor"
image_hover_unselected="buy_over"
image_unselected="buy_off"
image_pressed="buy_press"
height="18"
label="BUY L$"
label_color="White"
left_pad="0"
label_shadow="false"
label_shadow="true"
name="buyL"
pad_right="20"
pad_right="0"
pad_bottom="2"
tool_tip="Click to buy more L$"
top="2"
top="0"
width="55" />
<text
type="string"
......@@ -88,7 +90,7 @@
left_pad="0"
name="TimeText"
tool_tip="Current time (Pacific)"
width="100">
width="145">
24:00 AM PST
</text>
<button
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment