From f8e5ae8006b144b111f474640beb96ae135ae8ed Mon Sep 17 00:00:00 2001 From: dmitrykproductengine Date: Fri, 4 Oct 2013 14:04:31 +0300 Subject: [PATCH] MAINT-3142 FIXED Hover over highlighting broken in Second Life 3.6.6 (280797) --- indra/llui/llcommandmanager.cpp | 6 +- indra/llui/llcommandmanager.h | 9 ++- indra/llui/lltoolbar.cpp | 3 +- indra/newview/app_settings/commands.xml | 55 +++++++++++++++--- .../skins/default/textures/textures.xml | 4 +- .../textures/toolbar_icons/highlighting.png | Bin 500 -> 457 bytes .../toolbar_icons/highlighting_selected.png | Bin 0 -> 615 bytes .../textures/widgets/ComboButton_Hover.png | Bin 0 -> 459 bytes .../default/xui/en/widgets/location_input.xml | 1 + 9 files changed, 64 insertions(+), 14 deletions(-) create mode 100644 indra/newview/skins/default/textures/toolbar_icons/highlighting_selected.png create mode 100644 indra/newview/skins/default/textures/widgets/ComboButton_Hover.png diff --git a/indra/llui/llcommandmanager.cpp b/indra/llui/llcommandmanager.cpp index ab37ee48b6..49cfb2255e 100755 --- a/indra/llui/llcommandmanager.cpp +++ b/indra/llui/llcommandmanager.cpp @@ -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) diff --git a/indra/llui/llcommandmanager.h b/indra/llui/llcommandmanager.h index 47a9b86785..9f276f712d 100755 --- a/indra/llui/llcommandmanager.h +++ b/indra/llui/llcommandmanager.h @@ -96,7 +96,8 @@ public: Mandatory name; Mandatory tooltip_ref; - Optional hover_icon; + Optional hover_icon_selected; + Optional hover_icon_unselected; Mandatory execute_function; Optional 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; diff --git a/indra/llui/lltoolbar.cpp b/indra/llui/lltoolbar.cpp index 75f52b8e34..6bfe113933 100755 --- a/indra/llui/lltoolbar.cpp +++ b/indra/llui/lltoolbar.cpp @@ -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(button_p); diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml index aa8e3b5166..376e1a70af 100755 --- a/indra/newview/app_settings/commands.xml +++ b/indra/newview/app_settings/commands.xml @@ -3,6 +3,8 @@ - + + @@ -163,6 +164,7 @@ with the same filename but different name + diff --git a/indra/newview/skins/default/textures/toolbar_icons/highlighting.png b/indra/newview/skins/default/textures/toolbar_icons/highlighting.png index 093bace257d61a308ef98d7c3062514e71c1c518..c227f07513ee688479381592845d2a0979fe7455 100644 GIT binary patch literal 457 zcmV;)0XF`LP)C`=ku~@ z8q+0QN-2m%%skJB${2G26INN4HO?Fb5X5pE#{%zCA!C=oU1z=@#M?3*ML)FG4a8=k zWzze{0GtSJ1H{}JAUGtLD`0j8%qAL61K`P>fx4~@iPHck&-`zJ>8%CJbC z;=e6WN@>k}3&9loV`w-RQOo?Z2im#pWe@aO0Za58{kOoftg2mx%*h+D*UI<(*=n`A z#fRj&2gCwXgZ-wWD0-ewr#FMa;LLShn`sMbFlWS;sJuOyOist+@m*0AC)iL29cNFO zzmGe zSad^gZEa<4bO1wgWnpw>WFU8GbZ8()Nlj2!fese{00CS{L_t(o!|j-{Zo)tiMBg53 zyFhZ`!qiB706qLXKR}P-9SA_j_WDR8@tD6eD)K-KeUH z!{LBluUA3{hzRpM7gbDE9|Sd%Nhy(1qBOEVnm?3QD~l6C03c+RUXZ!yN4B02yx90W zQkvEBLM}TOyxEw!xScWelwn^KdlCByF_*W}BQ%Ga7sWmWteF*SuFo*D&x&~&{;ZhW zcHw*YJ?2>W&BI(O_TB&gjevDqtv%w^VE>nuE^lRin><-5A_P@so@W;i`D3A?N@$vf z7^53vF-DrELA$PF7zQ?*4Ru`??_#IZiLUG3SDk&|GYkXMG(8$*3AL8XC9BnnX`0>_ qcjGwH_dTjw%+iz+X2v*<0K5T5p7O~}8HMct0000Px#24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2i*z- z3pXPKL@c=g00HMoL_t(Y$HkVtZWBQih0nb^iS6-^EQbn&5Fr)_i7w@ehu{%VDnEc9 z!VRtaJOD2O1>r|Z16T+oB#J~h_Ih{b9tv+_LchbEX1a6qopVPc*v=gQ69CWZdy`WF zcmv=SfL{XO{@sTUUbow=qY&c0a~T0?NSlb!Lm zl@Rrd=WZO;CmDfSORoVW(#F4fivK)LL{_ZxPgcTOOGFCw-oFo3BnX93k`$28P(^z0 z-?==`Pv3q#d%kG5?j4RF?P-=Ziowj}+t)>Q@%`r_&+}6unN6qD!})yva$<%bs+5A(8c`HIm1P-gW`>AdU9pIuX&MAU5Qxa5b}xNML_kDfX03TA@w9

6ZZNe~IX%RuM*CS8&L|YU^702-GB1W1DRO{Pg>M{ssK~9V~|r_O}24002ovPDHLkV1hPS Byxsr+ literal 0 HcmV?d00001 diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml index 61ec046649..4ea1aa6efb 100755 --- a/indra/newview/skins/default/xui/en/widgets/location_input.xml +++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml @@ -150,6 +150,7 @@