[XP Tools] Initial merge Cherry Pick Also modernize llfloaterauction internally, but leave the ui the same for now. Breaks out script_question_mute() in llviewermessage.cpp to better sync with upstream Adds support for UnknownScriptQuestion notification (translators need to translate this one~) RLVa note: Rewrote RLVa permissions handling block just a bit. Added 13 new capabilities from the XP Tools, I doubt all of them really exist. Minor update to LLComboBox, decided against implementing LLIconsComboBox for now. Modified LLExperienceLog::notify to lookup names and display them along with the slurls since our editors don't do that automatically. Experience tweak: Changed a few notify's to notifytips so that we can click the links to experience profiles from chat instead of via hacked in buttons Migrated LLFloaterCompileQueue to a proper Instance Tracker so we can call getKey Modernized LLSD, gives us reverse iterators and the new debugging impl. We needed the reverse iterators. Experience tweak: Added virtual destructors to responders. Updated llhandle.h to allow calling getDerivedHandle in public. Updated LLScrollContainer and LLScrollBar to be more modern. Added LLFlatListView/flat_list_view from upstream - these don't seem work though? Added some newer login/logout strings to strings.xml Thanks for the default timeout policies, Aleric~ To avoid needing to scroll through tabs, about land tabs now are as big as they need to be to display their labels, same on groups Group Members and Roles has been renamed to just Members because this allows the new Experiences tab enough room to display. Thanks to Henri Beauchamp (Cool VL Viewer) for the setupList augmentation. (without it, I'd still be stuck) Thanks to Shyotl for the helpsies~ Added the LSL constants, events, and functions that LL neglected to put in. Added click callbacks and name lookups for profile linky texts~ Merge is up to 22b4cdc Old TODO: Get the uis looking nice (profiles? Experiences... floater) - done Old TODO: Make sure flatlistviews look okay... - Not using Old TODO: Fix LLFloaterExperiencePicker, right now the panel does not show. - unsure Old TODO: Remove the llfloaterabout.cpp change. - done Merges llexperiencecache with upstream and unstable Introduces LLCoroResponder, TODO: Make everything use this. Updates Reporter floater to the latest, supports the new cap thingy Also adds these commits/changes: [XPTools] Double clicking experiences in namelists should open the profile Add List.CopyNames support for Experiences [XP Tools] Some UI work, I'll do more later [XPTools] More UI Stuff, Later is now! Allow getSLURL for experiences WIP Experience list menu Also make EXPERIENCE > OBJECT, because mainline started OBJECT already [XPTools] Add Experience support to Name UI [XPTools] Fix experience profile UI 9c3067e843265587e91c659200a8d783acf2d9b2 [XPTools] Fix experience location showing "last" and getting set to "last" [XPTools] Move Experiences floater from view menu to world menu [XPTools] Fix up more UI [XPTools] Fix experiences panels [XPTools] Hide pieces of the Experiences menu when they're not usable [XPTools] More UI work, mostly to get the menus working [XPTools] The events list is for events, not experiences, remove menu # Conflicts: # indra/llcommon/llsd.cpp - merge with unstable branch # indra/llmessage/message_prehash.cpp # indra/llmessage/message_prehash.h # indra/llui/llscrollbar.cpp # indra/llui/llscrollcontainer.cpp # indra/llui/llurlentry.cpp # indra/llui/llurlregistry.cpp # indra/newview/app_settings/keywords.ini # indra/newview/app_settings/settings.xml # indra/newview/llappviewer.cpp # indra/newview/llappviewer.h # indra/newview/llassetuploadresponders.cpp # indra/newview/llcompilequeue.* - merge stable # indra/newview/llfloaterabout.cpp # indra/newview/llfloaterland.* - merge unstable # indra/newview/llfloaterproperties.cpp # indra/newview/llfloaterregioninfo.* - merge unstable # indra/newview/llmenucommands.cpp - merge unstable # indra/newview/llpreviewscript.cpp - merge unstable # indra/newview/llviewermessage.cpp - merge unstable # indra/newview/llviewerregion.cpp - merge unstable # indra/newview/skins/default/textures/textures.xml - merge unstable # indra/newview/skins/default/xui/en-us/strings.xml - merge unstable
149 lines
4.5 KiB
C++
149 lines
4.5 KiB
C++
/**
|
|
* @file llscrollbar.h
|
|
* @brief Scrollbar UI widget
|
|
*
|
|
* $LicenseInfo:firstyear=2001&license=viewerlgpl$
|
|
* Second Life Viewer Source Code
|
|
* Copyright (C) 2010, Linden Research, Inc.
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation;
|
|
* version 2.1 of the License only.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*
|
|
* Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
|
|
* $/LicenseInfo$
|
|
*/
|
|
|
|
#ifndef LL_SCROLLBAR_H
|
|
#define LL_SCROLLBAR_H
|
|
|
|
#include "stdtypes.h"
|
|
#include "lluictrl.h"
|
|
#include "v4color.h"
|
|
#include "llbutton.h"
|
|
|
|
//
|
|
// Constants
|
|
//
|
|
const S32 SCROLLBAR_SIZE = 16;
|
|
|
|
|
|
//
|
|
// Classes
|
|
//
|
|
class LLScrollbar
|
|
: public LLUICtrl
|
|
{
|
|
public:
|
|
enum ORIENTATION { HORIZONTAL, VERTICAL };
|
|
|
|
typedef boost::function<void (S32, LLScrollbar*)> callback_t;
|
|
LLScrollbar(const std::string& name, LLRect rect,
|
|
ORIENTATION orientation,
|
|
S32 doc_size, S32 doc_pos, S32 page_size,
|
|
callback_t change_callback,
|
|
S32 step_size = 1);
|
|
|
|
public:
|
|
virtual ~LLScrollbar();
|
|
|
|
virtual void setValue(const LLSD& value);
|
|
|
|
// Overrides from LLView
|
|
virtual BOOL handleKeyHere(KEY key, MASK mask);
|
|
virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask);
|
|
virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask);
|
|
virtual BOOL handleDoubleClick(S32 x, S32 y, MASK mask);
|
|
virtual BOOL handleHover(S32 x, S32 y, MASK mask);
|
|
virtual BOOL handleScrollWheel(S32 x, S32 y, S32 clicks);
|
|
virtual BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop,
|
|
EDragAndDropType cargo_type, void *cargo_data, EAcceptance *accept, std::string &tooltip_msg);
|
|
|
|
virtual void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
|
|
|
|
virtual void draw();
|
|
|
|
// How long the "document" is.
|
|
void setDocSize( S32 size );
|
|
S32 getDocSize() const { return mDocSize; }
|
|
|
|
// How many "lines" the "document" has scrolled.
|
|
// 0 <= DocPos <= DocSize - DocVisibile
|
|
bool setDocPos( S32 pos, BOOL update_thumb = TRUE );
|
|
S32 getDocPos() const { return mDocPos; }
|
|
|
|
BOOL isAtBeginning();
|
|
BOOL isAtEnd();
|
|
|
|
// Setting both at once.
|
|
void setDocParams( S32 size, S32 pos );
|
|
|
|
// How many "lines" of the "document" is can appear on a page.
|
|
void setPageSize( S32 page_size );
|
|
S32 getPageSize() const { return mPageSize; }
|
|
|
|
// The farthest the document can be scrolled (top of the last page).
|
|
S32 getDocPosMax() const { return llmax( 0, mDocSize - mPageSize); }
|
|
|
|
void pageUp(S32 overlap);
|
|
void pageDown(S32 overlap);
|
|
|
|
void onLineUpBtnPressed(const LLSD& data);
|
|
void onLineDownBtnPressed(const LLSD& data);
|
|
|
|
S32 getThickness() const { return mThickness; }
|
|
void setThickness(S32 thickness);
|
|
|
|
void setTrackColor( const LLColor4& color ) { mTrackColor = color; }
|
|
void setThumbColor( const LLColor4& color ) { mThumbColor = color; }
|
|
void setHighlightColor( const LLColor4& color ) { mHighlightColor = color; }
|
|
void setShadowColor( const LLColor4& color ) { mShadowColor = color; }
|
|
|
|
void setOnScrollEndCallback(void (*callback)(void*), void* userdata) { mOnScrollEndCallback = callback; mOnScrollEndData = userdata;}
|
|
|
|
private:
|
|
void updateThumbRect();
|
|
bool changeLine(S32 delta, BOOL update_thumb );
|
|
|
|
callback_t mChangeCallback;
|
|
|
|
const ORIENTATION mOrientation;
|
|
S32 mDocSize; // Size of the document that the scrollbar is modeling. Units depend on the user. 0 <= mDocSize.
|
|
S32 mDocPos; // Position within the doc that the scrollbar is modeling, in "lines" (user size)
|
|
S32 mPageSize; // Maximum number of lines that can be seen at one time.
|
|
S32 mStepSize;
|
|
BOOL mDocChanged;
|
|
|
|
LLRect mThumbRect;
|
|
S32 mDragStartX;
|
|
S32 mDragStartY;
|
|
F32 mHoverGlowStrength;
|
|
F32 mCurGlowStrength;
|
|
|
|
LLRect mOrigRect;
|
|
S32 mLastDelta;
|
|
|
|
LLColor4 mTrackColor;
|
|
LLColor4 mThumbColor;
|
|
LLColor4 mFocusColor;
|
|
LLColor4 mHighlightColor;
|
|
LLColor4 mShadowColor;
|
|
|
|
void (*mOnScrollEndCallback)(void*);
|
|
void *mOnScrollEndData;
|
|
S32 mThickness;
|
|
};
|
|
|
|
|
|
#endif // LL_SCROLLBAR_H
|