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

Fix some...

master
Ansariel 2024-01-07 16:34:14 +01:00
parent 8d59c0b1a3
commit 2737820ca8
4 changed files with 33 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
indra/newview/piemenu.cpp
View File

@ -45,20 +45,23 @@ static PieChildRegistry::Register<PieSlice> pie_r2("pie_slice");
static PieChildRegistry::Register<PieSeparator> pie_r3("pie_separator");
// pie slice label text positioning
const S32 PIE_X[] = {64, 45, 0, -45, -63, -45, 0, 45};
const S32 PIE_Y[] = { 0, 44, 73, 44, 0, -44, -73, -44};
constexpr S32 PIE_X[] = {64, 45, 0, -45, -63, -45, 0, 45};
constexpr S32 PIE_Y[] = { 0, 44, 73, 44, 0, -44, -73, -44};
const S32 PIE_INNER_SIZE = 20; // radius of the inner pie circle
const F32 PIE_POPUP_FACTOR = 1.7f; // pie menu size factor on popup
const F32 PIE_POPUP_TIME = 0.25f; // time to shrink from popup size to regular size
const S32 PIE_OUTER_SIZE = 96; // radius of the outer pie circle
const F32 PIE_OUTER_SHADE_FACTOR = 1.09f; // size factor of the outer shading ring
const F32 PIE_SLICE_DIVIDER_WIDTH = 0.04f; // width of a slice divider in radians
const F32 PIE_MAX_SLICES_F = F32(PIE_MAX_SLICES);
constexpr S32 PIE_INNER_SIZE = 20; // radius of the inner pie circle
constexpr F32 PIE_POPUP_FACTOR = 1.7f; // pie menu size factor on popup
constexpr F32 PIE_POPUP_TIME = 0.25f; // time to shrink from popup size to regular size
constexpr S32 PIE_OUTER_SIZE = 96; // radius of the outer pie circle
constexpr F32 PIE_OUTER_SHADE_FACTOR = 1.09f; // size factor of the outer shading ring
constexpr F32 PIE_SLICE_DIVIDER_WIDTH = 0.04f; // width of a slice divider in radians
constexpr F32 PIE_MAX_SLICES_F = F32(PIE_MAX_SLICES);
PieMenu::PieMenu(const LLMenuGL::Params& p) :
LLMenuGL(p),
mCurrentSegment(-1)
mCurrentSegment(-1),
mOldSlice(nullptr),
mSlice(nullptr),
mFirstClick(true)
{
LL_DEBUGS("Pie") << "PieMenu::PieMenu()" << LL_ENDL;
@ -75,12 +78,6 @@ PieMenu::PieMenu(const LLMenuGL::Params& p) :
// set slices pointer to our own slices
mSlices = &mMySlices;
// this will be the first click on the menu
mFirstClick = true;
// clean initialisation
mSlice = NULL;
}
bool PieMenu::addChild(LLView* child, S32 tab_group)
@ -92,7 +89,7 @@ bool PieMenu::addChild(LLView* child, S32 tab_group)
}
// add a new slice to the menu
mSlices->push_back(child);
mSlices->emplace_back(child);
// tell the view that our menu has changed and reshape it back to correct size
LLUICtrl::addChild(child);
@ -205,18 +202,17 @@ void PieMenu::show(S32 x, S32 y, LLView* spawning_view)
mSlices = &mMySlices;
// reset enable update checks for slices
for (slice_list_t::iterator it = mSlices->begin(); it != mSlices->end(); ++it)
for (auto slice : *mSlices)
{
PieSlice* resetSlice = dynamic_cast<PieSlice*>(*it);
if (resetSlice)
if (auto resetSlice = dynamic_cast<PieSlice*>(slice); resetSlice)
{
resetSlice->resetUpdateEnabledCheck();
}
}
// cleanup
mSlice = NULL;
mOldSlice = NULL;
mSlice = nullptr;
mOldSlice = nullptr;
// draw the menu on screen
setVisible(TRUE);
@ -262,7 +258,7 @@ void PieMenu::draw()
gGL.pushMatrix();
// save the widget's rectangle for later use
LLRect r = getRect();
const LLRect& r = getRect();
// initialize pie scale factor for popup effect
F32 factor = getScaleFactor();
@ -300,7 +296,7 @@ void PieMenu::draw()
borderColor %= 0.f;
}
S32 steps = 100;
constexpr S32 steps = 100;
// move origin point to the center of our rectangle
LLUI::instance().translate(r.getWidth() / 2.f, r.getHeight() / 2.f);
@ -313,7 +309,7 @@ void PieMenu::draw()
cur_item_iter = mSlices->begin();
// clear current slice pointer
mSlice = NULL;
mSlice = nullptr;
// current slice number is 0
S32 num = 0;
@ -539,10 +535,9 @@ BOOL PieMenu::handleMouseButtonUp(S32 x, S32 y, MASK mask)
// swap out the list of items for the ones in the submenu
mSlices = &currentSubmenu->mMySlices;
// reset enable update checks for slices
for (slice_list_t::iterator it = mSlices->begin(); it != mSlices->end(); ++it)
for (auto slice : *mSlices)
{
PieSlice* resetSlice = dynamic_cast<PieSlice*>(*it);
if (resetSlice)
if (auto resetSlice = dynamic_cast<PieSlice*>(slice); resetSlice)
{
resetSlice->resetUpdateEnabledCheck();
}
@ -564,7 +559,7 @@ BOOL PieMenu::handleMouseButtonUp(S32 x, S32 y, MASK mask)
// release mouse capture after the first click if we still have it grabbed
if (hasMouseCapture())
{
gFocusMgr.setMouseCapture(NULL);
gFocusMgr.setMouseCapture(nullptr);
}
// give control back to the system

4
indra/newview/piemenu.h
View File

@ -31,7 +31,7 @@
#include "llmenugl.h"
#include "llframetimer.h"
const S32 PIE_MAX_SLICES = 8;
constexpr S32 PIE_MAX_SLICES = 8;
// PieChildRegistry contains a list of allowed child types for the XUI definition
struct PieChildRegistry : public LLChildRegistry<PieChildRegistry>
@ -76,7 +76,7 @@ public:
void hide();
// our item list type definition
typedef std::list<LLView*> slice_list_t;
typedef std::vector<LLView*> slice_list_t;
// the actual item list
slice_list_t mMySlices;
// pointer to the currently used list

8
indra/newview/pieslice.cpp
View File

@ -135,21 +135,21 @@ std::string PieSlice::getLabel() const
}
// accessor
void PieSlice::setLabel(const std::string& newLabel)
void PieSlice::setLabel(std::string_view newLabel)
{
mLabel = newLabel;
}
// accessor
bool PieSlice::getStartAutohide()
bool PieSlice::getStartAutohide() const
{
return mStartAutohide;
}
// accessor
bool PieSlice::getAutohide()
bool PieSlice::getAutohide() const
{
return mStartAutohide | mAutohide;
return mStartAutohide || mAutohide;
}
void PieSlice::resetUpdateEnabledCheck()

6
indra/newview/pieslice.h
View File

@ -66,13 +66,13 @@ public:
// accessor to expose the label to the outside (value is the same as label)
std::string getLabel() const;
void setLabel(const std::string& newLabel);
void setLabel(std::string_view newLabel);
LLSD getValue() const;
void setValue(const LLSD& value);
// accessor to expose the autohide feature
bool getStartAutohide();
bool getAutohide();
bool getStartAutohide() const;
bool getAutohide() const;
// callback connection for the onCommit method to launch the specified function
boost::signals2::connection setClickCallback(const commit_signal_t::slot_type& cb)