admin/phoenix-firestorm
1
0
Fork 0
mirror of https://github.com/FirestormViewer/phoenix-firestorm.git synced 2026-08-14 00:48:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #239 from trish-sl/fire36758

Browse Source 
FIX - Hover height FS-specific button steps inconsistencies
This commit is contained in:
Zi Ree
2026-06-16 10:36:36 +02:00
committed by GitHub
parent a37d528166 432e926928
commit 481e1257cc
2 changed files with 9 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
indra/newview/llfloaterhoverheight.cpp
+9 -27
View File
@@ -28,6 +28,7 @@
#include "llviewerprecompiledheaders.h"
#include "llfloaterhoverheight.h"
#include "llkeyboard.h"
#include "llsliderctrl.h"
#include "llviewercontrol.h"
#include "llsdserialize.h"
@@ -40,7 +41,6 @@
#endif
LLFloaterHoverHeight::LLFloaterHoverHeight(const LLSD& key) : LLFloater(key)
, mModifiers(MASK_NONE) // <FS:Zi> FIRE-33859 - Add +/- and reset buttons to hover height slider
{
}
@@ -152,18 +152,6 @@ void LLFloaterHoverHeight::onFinalCommit()
}
// <FS:Zi> FIRE-33859 - Add +/- and reset buttons to hover height slider
bool LLFloaterHoverHeight::handleKey(KEY key, MASK mask, bool called_from_parent)
{
mModifiers = mask;
return LLUICtrl::handleKey(key, mask, called_from_parent);
}
bool LLFloaterHoverHeight::handleKeyUp(KEY key, MASK mask, bool called_from_parent)
{
mModifiers = mask;
return LLUICtrl::handleKeyUp(key, mask, called_from_parent);
}
void LLFloaterHoverHeight::onResetButtonClicked()
{
onButtonClicked(0.0f);
@@ -189,19 +177,15 @@ void LLFloaterHoverHeight::onButtonClicked(F32 value)
}
else
{
switch (mModifiers)
MASK mask = gKeyboard ? gKeyboard->currentMask(true) : MASK_NONE;
if (mask & MASK_ALT)
{
case MASK_ALT:
{
value *= 10.0f;
break;
}
case MASK_CONTROL:
case MASK_SHIFT:
{
value *= 0.1f;
break;
}
value *= 10.0f;
}
else if (mask & (MASK_CONTROL | MASK_SHIFT))
{
value *= 0.1f;
}
sldrCtrl->setValue(sldrCtrl->getValueF32() + value);
}
@@ -257,5 +241,3 @@ void LLFloaterHoverHeight::updateEditEnabled()
syncFromPreferenceSetting(this);
}
}
indra/newview/llfloaterhoverheight.h
-5
View File
@@ -44,17 +44,12 @@ public:
void onRegionChanged();
void onSimulatorFeaturesReceived(const LLUUID &region_id);
void updateEditEnabled();
// <FS:Zi> FIRE-33859 - Add +/- and reset buttons to hover height slider
bool handleKey(KEY key, MASK mask, bool called_from_parent);
bool handleKeyUp(KEY key, MASK mask, bool called_from_parent);
void onResetButtonClicked();
void onPlusButtonClicked();
void onMinusButtonClicked();
void onButtonClicked(F32 value);
MASK mModifiers;
// </FS:Zi>
/*virtual*/ void onClose(bool app_quitting);