summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRick Pasetto <rick@lindenlab.com>2010-02-16 10:40:39 -0800
committerRick Pasetto <rick@lindenlab.com>2010-02-16 10:40:39 -0800
commitc6a8d9a7e71a22290ac8db63828f3c6fdd018ffd (patch)
tree84358e97e74e29de6ba62035b9e25a37fd2c3061
parentf82e57a9c7f96889e07f48bdfa4ab362ba191f5a (diff)
Tweak sizes a tiny bit to make media controls look a little better
-rw-r--r--indra/newview/llpanelprimmediacontrols.cpp6
-rw-r--r--indra/newview/skins/default/xui/en/panel_prim_media_controls.xml8
2 files changed, 6 insertions, 8 deletions
diff --git a/indra/newview/llpanelprimmediacontrols.cpp b/indra/newview/llpanelprimmediacontrols.cpp
index 479769ee20..a53a3ba1ad 100644
--- a/indra/newview/llpanelprimmediacontrols.cpp
+++ b/indra/newview/llpanelprimmediacontrols.cpp
@@ -724,10 +724,10 @@ void LLPanelPrimMediaControls::draw()
mMediaControlsStack->updateLayout();
// adjust for layout stack spacing
- S32 space = mMediaControlsStack->getPanelSpacing() + 1;
+ S32 space = mMediaControlsStack->getPanelSpacing() + 2;
LLRect controls_bg_area = mMediaControlsStack->getRect();
- controls_bg_area.mTop += space;
+ controls_bg_area.mTop += space + 2;
// adjust to ignore space from volume slider
controls_bg_area.mBottom += mVolumeSliderCtrl->getRect().getHeight();
@@ -736,7 +736,7 @@ void LLPanelPrimMediaControls::draw()
controls_bg_area.mLeft += mLeftBookend->getRect().getWidth() - space;
// ignore space from right bookend padding
- controls_bg_area.mRight -= mRightBookend->getRect().getWidth() - space;
+ controls_bg_area.mRight -= mRightBookend->getRect().getWidth() - space - 2;
// draw control background UI image
mBackgroundImage->draw( controls_bg_area, UI_VERTEX_COLOR % alpha);
diff --git a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
index e1d8ee241d..6b5f0c3896 100644
--- a/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
+++ b/indra/newview/skins/default/xui/en/panel_prim_media_controls.xml
@@ -71,7 +71,7 @@
layout="topleft"
top="0"
left="0"
- border_size="1"
+ border_size="0"
mouse_opaque="false"
orientation="horizontal">
<!-- outer layout_panels center the inner one -->
@@ -260,7 +260,7 @@
top="0"
height="22"
min_width="22"
- width="24">
+ width="22">
<button
name="play_btn"
follows="top"
@@ -272,7 +272,6 @@
hover_glow_amount="0.15"
layout="topleft"
tool_tip = "Play media"
- left_delta="2"
top="0"
height="22"
width="22">
@@ -288,7 +287,7 @@
layout="topleft"
top="0"
min_width="22"
- width="24">
+ width="22">
<button
name="pause_btn"
follows="top"
@@ -302,7 +301,6 @@
top="0"
height="22"
width="22"
- left_delta="-1"
tool_tip = "Pause media">
<button.commit_callback
function="MediaCtrl.Pause" />