diff options
author | Paul Guslisty <pguslisty@productengine.com> | 2010-03-31 16:50:06 +0300 |
---|---|---|
committer | Paul Guslisty <pguslisty@productengine.com> | 2010-03-31 16:50:06 +0300 |
commit | 1e74f573bbb7e9d3a6cf3134d3373a202912c721 (patch) | |
tree | f0a31f9427b35fd9b7902ac3df31d16271161019 | |
parent | 8ef5fd0e144af53e6044c0dfc15fda9b36bdd85a (diff) |
Fixed normal bug EXT-6505 (Certain gear icon buttons should not have chevrons)
- Created an icon that is just the gear icon, no dropdown chevron in places where there is no context menu, notably in: Nearby media popover, Master volume popover and Edit Floater
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/137/
--HG--
branch : product-engine
-rw-r--r-- | indra/newview/skins/default/textures/windows/Icon_Gear_Background.png | bin | 373 -> 370 bytes | |||
-rw-r--r-- | indra/newview/skins/default/textures/windows/Icon_Gear_Foreground.png | bin | 373 -> 371 bytes | |||
-rw-r--r-- | indra/newview/skins/default/textures/windows/Icon_Gear_Over.png | bin | 279 -> 293 bytes | |||
-rw-r--r-- | indra/newview/skins/default/textures/windows/Icon_Gear_Press.png | bin | 396 -> 365 bytes | |||
-rw-r--r-- | indra/newview/skins/default/xui/en/floater_tools.xml | 12 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/panel_volume_pulldown.xml | 4 |
6 files changed, 8 insertions, 8 deletions
diff --git a/indra/newview/skins/default/textures/windows/Icon_Gear_Background.png b/indra/newview/skins/default/textures/windows/Icon_Gear_Background.png Binary files differindex db74b93afd..93d62a8d4f 100644 --- a/indra/newview/skins/default/textures/windows/Icon_Gear_Background.png +++ b/indra/newview/skins/default/textures/windows/Icon_Gear_Background.png diff --git a/indra/newview/skins/default/textures/windows/Icon_Gear_Foreground.png b/indra/newview/skins/default/textures/windows/Icon_Gear_Foreground.png Binary files differindex 1032e45f7e..b2b2a77a88 100644 --- a/indra/newview/skins/default/textures/windows/Icon_Gear_Foreground.png +++ b/indra/newview/skins/default/textures/windows/Icon_Gear_Foreground.png diff --git a/indra/newview/skins/default/textures/windows/Icon_Gear_Over.png b/indra/newview/skins/default/textures/windows/Icon_Gear_Over.png Binary files differindex 01dbde102b..67bd399358 100644 --- a/indra/newview/skins/default/textures/windows/Icon_Gear_Over.png +++ b/indra/newview/skins/default/textures/windows/Icon_Gear_Over.png diff --git a/indra/newview/skins/default/textures/windows/Icon_Gear_Press.png b/indra/newview/skins/default/textures/windows/Icon_Gear_Press.png Binary files differindex 6614bdd165..6fc3744d6b 100644 --- a/indra/newview/skins/default/textures/windows/Icon_Gear_Press.png +++ b/indra/newview/skins/default/textures/windows/Icon_Gear_Press.png diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml index fd046c3695..8e7587f4cd 100644 --- a/indra/newview/skins/default/xui/en/floater_tools.xml +++ b/indra/newview/skins/default/xui/en/floater_tools.xml @@ -2701,15 +2701,15 @@ even though the user gets a free copy. <button follows="top|left" tool_tip="Edit this Media" - height="18" - image_disabled="OptionsMenu_Disabled" - image_selected="OptionsMenu_Press" - image_unselected="OptionsMenu_Off" + height="12" + image_disabled="Icon_Gear_Foreground" + image_selected="Icon_Gear_Background" + image_unselected="Icon_Gear_Press" layout="topleft" left_pad="10" name="edit_media" - top_delta="0" - width="18"> + top_delta="3" + width="12"> <button.commit_callback function="BuildTool.EditMedia"/> </button> diff --git a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml index cd66c56ca1..7b22b2cce1 100644 --- a/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml +++ b/indra/newview/skins/default/xui/en/panel_volume_pulldown.xml @@ -32,9 +32,9 @@ parameter="MuteAudio" /> </slider> <button - left="7" + left="10" top_pad="9" - width="18" + width="12" height="12" follows="top|left" name="prefs_btn" |