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

MAINT-3142 FIXED Hover over highlighting broken in Second Life 3.6.6 (280797)

meow-7.2.2
dmitrykproductengine 2013-10-04 14:04:31 +03:00
parent e4c43d6bed
commit f8e5ae8006
9 changed files with 64 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
indra/llui/llcommandmanager.cpp
View File

@ -50,7 +50,8 @@ const LLCommandId LLCommandId::null = LLCommandId("null command");
LLCommand::Params::Params()
: available_in_toybox("available_in_toybox", false)
, icon("icon")
, hover_icon("hover_icon")
, hover_icon_unselected("hover_icon_unselected")
, hover_icon_selected("hover_icon_selected")
, label_ref("label_ref")
, name("name")
, tooltip_ref("tooltip_ref")
@ -72,7 +73,8 @@ LLCommand::LLCommand(const LLCommand::Params& p)
: mIdentifier(p.name)
, mAvailableInToybox(p.available_in_toybox)
, mIcon(p.icon)
, mHoverIcon(p.hover_icon)
, mHoverIconUnselected(p.hover_icon_unselected)
, mHoverIconSelected(p.hover_icon_selected)
, mLabelRef(p.label_ref)
, mName(p.name)
, mTooltipRef(p.tooltip_ref)

9
indra/llui/llcommandmanager.h
View File

@ -96,7 +96,8 @@ public:
Mandatory<std::string> name;
Mandatory<std::string> tooltip_ref;
Optional<std::string> hover_icon;
Optional<std::string> hover_icon_selected;
Optional<std::string> hover_icon_unselected;
Mandatory<std::string> execute_function;
Optional<LLSD> execute_parameters;
@ -126,7 +127,8 @@ public:
const std::string& labelRef() const { return mLabelRef; }
const std::string& name() const { return mName; }
const std::string& tooltipRef() const { return mTooltipRef; }
const std::string& hoverIcon() const {return mHoverIcon; }
const std::string& hoverIconUnselected() const {return mHoverIconUnselected; }
const std::string& hoverIconSelected() const {return mHoverIconSelected; }
const std::string& executeFunctionName() const { return mExecuteFunction; }
const LLSD& executeParameters() const { return mExecuteParameters; }
@ -153,7 +155,8 @@ private:
std::string mLabelRef;
std::string mName;
std::string mTooltipRef;
std::string mHoverIcon;
std::string mHoverIconUnselected;
std::string mHoverIconSelected;
std::string mExecuteFunction;
LLSD mExecuteParameters;

3
indra/llui/lltoolbar.cpp
View File

@ -928,7 +928,8 @@ LLToolBarButton* LLToolBar::createButton(const LLCommandId& id)
button_p.label = LLTrans::getString(commandp->labelRef());
button_p.tool_tip = LLTrans::getString(commandp->tooltipRef());
button_p.image_overlay = LLUI::getUIImage(commandp->icon());
button_p.image_hover_unselected = LLUI::getUIImage(commandp->hoverIcon());
button_p.image_hover_unselected = LLUI::getUIImage(commandp->hoverIconUnselected());
button_p.image_hover_selected = LLUI::getUIImage(commandp->hoverIconSelected());
button_p.button_flash_enable = commandp->isFlashingAllowed();
button_p.overwriteFrom(mButtonParams[mButtonType]);
LLToolBarButton* button = LLUICtrlFactory::create<LLToolBarButton>(button_p);

55
indra/newview/app_settings/commands.xml
View File

@ -3,6 +3,8 @@
<command name="aboutland"
available_in_toybox="true"
icon="Command_AboutLand_Icon"
hover_icon_unselected="Command_Highlighting_Icon"
hover_icon_selected="Command_Highlighting_Selected_Icon"
label_ref="Command_AboutLand_Label"
tooltip_ref="Command_AboutLand_Tooltip"
execute_function="Floater.ToggleOrBringToFront"
@ -13,7 +15,8 @@
<command name="appearance"
available_in_toybox="true"
icon="Command_Appearance_Icon"
hover_icon="Command_Highlighting_Icon"
hover_icon_unselected="Command_Highlighting_Icon"
hover_icon_selected="Command_Highlighting_Selected_Icon"
label_ref="Command_Appearance_Label"
tooltip_ref="Command_Appearance_Tooltip"
execute_function="Floater.ToggleOrBringToFront"
@ -24,7 +27,8 @@
<command name="avatar"
available_in_toybox="true"
icon="Command_Avatar_Icon"
hover_icon="Command_Highlighting_Icon"
hover_icon_unselected="Command_Highlighting_Icon"
hover_icon_selected="Command_Highlighting_Selected_Icon"
label_ref="Command_Avatar_Label"
tooltip_ref="Command_Avatar_Tooltip"
execute_function="Floater.ToggleOrBringToFront"
@ -35,6 +39,8 @@
<command name="build"
available_in_toybox="true"
icon="Command_Build_Icon"
hover_icon_unselected="Command_Highlighting_Icon"
hover_icon_selected="Command_Highlighting_Selected_Icon"
label_ref="Command_Build_Label"
tooltip_ref="Command_Build_Tooltip"
execute_function="Build.Toggle"
@ -48,6 +54,8 @@
available_in_toybox="true"
is_flashing_allowed="true"
icon="Command_Chat_Icon"
hover_icon_unselected="Command_Highlighting_Icon"
hover_icon_selected="Command_Highlighting_Selected_Icon"
label_ref="Command_Chat_Label"
tooltip_ref="Command_Conversations_Tooltip"
execute_function="Floater.ToggleOrBringToFront"
@ -58,6 +66,8 @@
<command name="compass"
available_in_toybox="false"
icon="Command_Compass_Icon"
hover_icon_unselected="Command_Highlighting_Icon"
hover_icon_selected="Command_Highlighting_Selected_Icon"
label_ref="Command_Compass_Label"
tooltip_ref="Command_Compass_Tooltip"
execute_function="Floater.ToggleOrBringToFront"
@ -68,6 +78,8 @@
<command name="destinations"
available_in_toybox="true"
icon="Command_Destinations_Icon"
hover_icon_unselected="Command_Highlighting_Icon"
hover_icon_selected="Command_Highlighting_Selected_Icon"
label_ref="Command_Destinations_Label"
tooltip_ref="Command_Destinations_Tooltip"
execute_function="Floater.ToggleOrBringToFront"
@ -78,6 +90,8 @@
<command name="gestures"
available_in_toybox="true"
icon="Command_Gestures_Icon"
hover_icon_unselected="Command_Highlighting_Icon"
hover_icon_selected="Command_Highlighting_Selected_Icon"
label_ref="Command_Gestures_Label"
tooltip_ref="Command_Gestures_Tooltip"
execute_function="Floater.ToggleOrBringToFront"
@ -88,6 +102,8 @@
<command name="howto"
available_in_toybox="true"
icon="Command_HowTo_Icon"
hover_icon_unselected="Command_Highlighting_Icon"
hover_icon_selected="Command_Highlighting_Selected_Icon"
label_ref="Command_HowTo_Label"
tooltip_ref="Command_HowTo_Tooltip"
execute_function="Help.ToggleHowTo"
@ -96,7 +112,8 @@
<command name="inventory"
available_in_toybox="true"
icon="Command_Inventory_Icon"
hover_icon="Command_Highlighting_Icon"
hover_icon_unselected="Command_Highlighting_Icon"
hover_icon_selected="Command_Highlighting_Selected_Icon"
label_ref="Command_Inventory_Label"
tooltip_ref="Command_Inventory_Tooltip"
execute_function="Floater.ToggleOrBringToFront"
@ -107,6 +124,8 @@
<command name="map"
available_in_toybox="true"
icon="Command_Map_Icon"
hover_icon_unselected="Command_Highlighting_Icon"
hover_icon_selected="Command_Highlighting_Selected_Icon"
label_ref="Command_Map_Label"
tooltip_ref="Command_Map_Tooltip"
execute_function="Floater.ToggleOrBringToFront"
@ -117,6 +136,8 @@
<command name="marketplace"
available_in_toybox="false"
icon="Command_Marketplace_Icon"
hover_icon_unselected="Command_Highlighting_Icon"
hover_icon_selected="Command_Highlighting_Selected_Icon"
label_ref="Command_Marketplace_Label"
tooltip_ref="Command_Marketplace_Tooltip"
execute_function="Avatar.OpenMarketplace"
@ -124,7 +145,8 @@
<command name="minimap"
available_in_toybox="true"
icon="Command_MiniMap_Icon"
hover_icon="Command_Highlighting_Icon"
hover_icon_unselected="Command_Highlighting_Icon"
hover_icon_selected="Command_Highlighting_Selected_Icon"
label_ref="Command_MiniMap_Label"
tooltip_ref="Command_MiniMap_Tooltip"
execute_function="Floater.ToggleOrBringToFront"
@ -135,6 +157,8 @@
<command name="move"
available_in_toybox="true"
icon="Command_Move_Icon"
hover_icon_unselected="Command_Highlighting_Icon"
hover_icon_selected="Command_Highlighting_Selected_Icon"
label_ref="Command_Move_Label"
tooltip_ref="Command_Move_Tooltip"
execute_function="Floater.ToggleOrBringToFront"
@ -145,6 +169,8 @@
<command name="outbox"
available_in_toybox="false"
icon="Command_Outbox_Icon"
hover_icon_unselected="Command_Highlighting_Icon"
hover_icon_selected="Command_Highlighting_Selected_Icon"
label_ref="Command_Outbox_Label"
tooltip_ref="Command_Outbox_Tooltip"
execute_function="Floater.ToggleOrBringToFront"
@ -155,6 +181,8 @@
<command name="people"
available_in_toybox="true"
icon="Command_People_Icon"
hover_icon_unselected="Command_Highlighting_Icon"
hover_icon_selected="Command_Highlighting_Selected_Icon"
label_ref="Command_People_Label"
tooltip_ref="Command_People_Tooltip"
execute_function="Floater.ToggleOrBringToFront"
@ -165,6 +193,8 @@
<command name="picks"
available_in_toybox="true"
icon="Command_Picks_Icon"
hover_icon_unselected="Command_Highlighting_Icon"
hover_icon_selected="Command_Highlighting_Selected_Icon"
label_ref="Command_Picks_Label"
tooltip_ref="Command_Picks_Tooltip"
execute_function="Floater.ToggleOrBringToFront"
@ -175,7 +205,8 @@
<command name="places"
available_in_toybox="true"
icon="Command_Places_Icon"
hover_icon="Command_Highlighting_Icon"
hover_icon_unselected="Command_Highlighting_Icon"
hover_icon_selected="Command_Highlighting_Selected_Icon"
label_ref="Command_Places_Label"
tooltip_ref="Command_Places_Tooltip"
execute_function="Floater.ToggleOrBringToFront"
@ -186,6 +217,8 @@
<command name="preferences"
available_in_toybox="true"
icon="Command_Preferences_Icon"
hover_icon_unselected="Command_Highlighting_Icon"
hover_icon_selected="Command_Highlighting_Selected_Icon"
label_ref="Command_Preferences_Label"
tooltip_ref="Command_Preferences_Tooltip"
execute_function="Floater.ToggleOrBringToFront"
@ -196,6 +229,8 @@
<command name="profile"
available_in_toybox="true"
icon="Command_Profile_Icon"
hover_icon_unselected="Command_Highlighting_Icon"
hover_icon_selected="Command_Highlighting_Selected_Icon"
label_ref="Command_Profile_Label"
tooltip_ref="Command_Profile_Tooltip"
execute_function="Avatar.ToggleMyProfile"
@ -204,7 +239,8 @@
<command name="search"
available_in_toybox="true"
icon="Command_Search_Icon"
hover_icon="Command_Highlighting_Icon"
hover_icon_unselected="Command_Highlighting_Icon"
hover_icon_selected="Command_Highlighting_Selected_Icon"
label_ref="Command_Search_Label"
tooltip_ref="Command_Search_Tooltip"
execute_function="Floater.ToggleOrBringToFront"
@ -215,7 +251,8 @@
<command name="snapshot"
available_in_toybox="true"
icon="Command_Snapshot_Icon"
hover_icon="Command_Highlighting_Icon"
hover_icon_unselected="Command_Highlighting_Icon"
hover_icon_selected="Command_Highlighting_Selected_Icon"
label_ref="Command_Snapshot_Label"
tooltip_ref="Command_Snapshot_Tooltip"
execute_function="Floater.ToggleOrBringToFront"
@ -226,6 +263,8 @@
<command name="speak"
available_in_toybox="true"
icon="Command_Speak_Icon"
hover_icon_unselected="Command_Highlighting_Icon"
hover_icon_selected="Command_Highlighting_Selected_Icon"
label_ref="Command_Speak_Label"
tooltip_ref="Command_Speak_Tooltip"
execute_function="Agent.PressMicrophone"
@ -240,6 +279,8 @@
<command name="view"
available_in_toybox="true"
icon="Command_View_Icon"
hover_icon_unselected="Command_Highlighting_Icon"
hover_icon_selected="Command_Highlighting_Selected_Icon"
label_ref="Command_View_Label"
tooltip_ref="Command_View_Tooltip"
execute_function="Floater.ToggleOrBringToFront"

4
indra/newview/skins/default/textures/textures.xml
View File

@ -152,7 +152,8 @@ with the same filename but different name
<texture name="Command_Speak_Icon" file_name="toolbar_icons/speak.png" preload="true" />
<texture name="Command_View_Icon" file_name="toolbar_icons/view.png" preload="true" />
<texture name="Command_Voice_Icon" file_name="toolbar_icons/nearbyvoice.png" preload="true" />
<texture name="Command_Highlighting_Icon" file_name="toolbar_icons/highlighting.png" preload="true" />
<texture name="Command_Highlighting_Icon" file_name="toolbar_icons/highlighting.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
<texture name="Command_Highlighting_Selected_Icon" file_name="toolbar_icons/highlighting_selected.png" preload="true" scale.left="4" scale.top="19" scale.right="28" scale.bottom="4" />
<texture name="Caret_Bottom_Icon" file_name="toolbar_icons/caret_bottom.png" preload="true" scale.left="1" scale.top="23" scale.right="15" scale.bottom="1" />
<texture name="Caret_Right_Icon" file_name="toolbar_icons/caret_right.png" preload="true" scale.left="5" scale.top="15" scale.right="28" scale.bottom="1" />
<texture name="Caret_Left_Icon" file_name="toolbar_icons/caret_left.png" preload="true" scale.left="1" scale.top="15" scale.right="23" scale.bottom="1" />
@ -163,6 +164,7 @@ with the same filename but different name
<texture name="ComboButton_On" file_name="widgets/ComboButton_On.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
<texture name="ComboButton_Off" file_name="widgets/ComboButton_Off.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
<texture name="ComboButton_UpOff" file_name="widgets/ComboButton_UpOff.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
<texture name="ComboButton_Hovered" file_name="widgets/ComboButton_Hover.png" preload="true" scale.left="2" scale.top="19" scale.right="18" scale.bottom="2" />
<texture name="Container" file_name="containers/Container.png" preload="false" />

BIN
indra/newview/skins/default/textures/toolbar_icons/highlighting.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 500 B

After

Width:  |  Height:  |  Size: 457 B

BIN
indra/newview/skins/default/textures/toolbar_icons/highlighting_selected.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 615 B

BIN
indra/newview/skins/default/textures/widgets/ComboButton_Hover.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 459 B

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

@ -150,6 +150,7 @@
<combo_button
name="Location History"
label=""
image_hover_unselected="ComboButton_Hovered"
pad_right="0"/>
<combo_list
bg_writeable_color="MenuDefaultBgColor"