[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
136 lines
4.6 KiB
C++
136 lines
4.6 KiB
C++
/**
|
|
* @file llscrollcontainer.h
|
|
* @brief LLScrollContainer class header file.
|
|
*
|
|
* $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_LLSCROLLCONTAINER_H
|
|
#define LL_LLSCROLLCONTAINER_H
|
|
|
|
#include "lluictrl.h"
|
|
#ifndef LL_V4COLOR_H
|
|
#include "v4color.h"
|
|
#endif
|
|
#include "stdenums.h"
|
|
#include "llcoord.h"
|
|
#include "llscrollbar.h"
|
|
|
|
|
|
class LLViewBorder;
|
|
class LLUICtrlFactory;
|
|
|
|
/*****************************************************************************
|
|
*
|
|
* A decorator view class meant to encapsulate a clipped region which is
|
|
* scrollable. It automatically takes care of pixel perfect scrolling
|
|
* and cliipping, as well as turning the scrollbars on or off based on
|
|
* the width and height of the view you're scrolling.
|
|
*
|
|
*****************************************************************************/
|
|
class LLScrollContainer : public LLUICtrl
|
|
{
|
|
public:
|
|
// Note: vertical comes before horizontal because vertical
|
|
// scrollbars have priority for mouse and keyboard events.
|
|
enum SCROLL_ORIENTATION { VERTICAL, HORIZONTAL, SCROLLBAR_COUNT };
|
|
|
|
LLScrollContainer( const std::string& name, const LLRect& rect,
|
|
LLView* scrolled_view, BOOL is_opaque = FALSE,
|
|
const LLColor4& bg_color = LLColor4(0,0,0,0) );
|
|
virtual ~LLScrollContainer( void );
|
|
|
|
void setScrolledView(LLView* view) { mScrolledView = view; }
|
|
|
|
virtual void setValue(const LLSD& value) { mInnerRect.setValue(value); }
|
|
|
|
void setBorderVisible( BOOL b );
|
|
void setPassBackToChildren(bool b) { mPassBackToChildren = b; }
|
|
|
|
void scrollToShowRect( const LLRect& rect, const LLRect& constraint);
|
|
void scrollToShowRect( const LLRect& rect) { scrollToShowRect(rect, LLRect(0, mInnerRect.getHeight(), mInnerRect.getWidth(), 0)); }
|
|
|
|
void setReserveScrollCorner( BOOL b ) { mReserveScrollCorner = b; }
|
|
LLRect getVisibleContentRect();
|
|
LLRect getContentWindowRect();
|
|
virtual const LLRect& getScrolledViewRect() const { return mScrolledView ? mScrolledView->getRect() : LLRect::null; }
|
|
void pageUp(S32 overlap = 0);
|
|
void pageDown(S32 overlap = 0);
|
|
void goToTop();
|
|
void goToBottom();
|
|
bool isAtTop() { return mScrollbar[VERTICAL]->isAtBeginning(); }
|
|
bool isAtBottom() { return mScrollbar[VERTICAL]->isAtEnd(); }
|
|
S32 getBorderWidth() const;
|
|
|
|
// LLView functionality
|
|
virtual void reshape(S32 width, S32 height, BOOL called_from_parent = TRUE);
|
|
virtual BOOL handleKeyHere(KEY key, MASK mask);
|
|
virtual BOOL handleUnicodeCharHere(llwchar uni_char);
|
|
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 BOOL handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect);
|
|
virtual void draw();
|
|
virtual bool addChild(LLView* view, S32 tab_group = 0);
|
|
|
|
bool autoScroll(S32 x, S32 y);
|
|
virtual LLXMLNodePtr getXML(bool save_children) const;
|
|
static LLView* fromXML(LLXMLNodePtr node, LLView *parent, LLUICtrlFactory *factory);
|
|
|
|
S32 getSize() const { return mSize; }
|
|
void setSize(S32 thickness);
|
|
|
|
protected:
|
|
LLView* mScrolledView;
|
|
|
|
private:
|
|
void init();
|
|
// internal scrollbar handlers
|
|
virtual void scrollHorizontal( S32 new_pos );
|
|
virtual void scrollVertical( S32 new_pos );
|
|
void updateScroll();
|
|
public:
|
|
void calcVisibleSize( S32 *visible_width, S32 *visible_height, BOOL* show_h_scrollbar, BOOL* show_v_scrollbar ) const;
|
|
private:
|
|
|
|
LLScrollbar* mScrollbar[SCROLLBAR_COUNT];
|
|
S32 mSize;
|
|
BOOL mIsOpaque;
|
|
LLColor4 mBackgroundColor;
|
|
LLRect mInnerRect;
|
|
LLViewBorder* mBorder;
|
|
BOOL mReserveScrollCorner;
|
|
BOOL mAutoScrolling;
|
|
F32 mAutoScrollRate;
|
|
F32 mMinAutoScrollRate;
|
|
F32 mMaxAutoScrollRate;
|
|
bool mHideScrollbar;
|
|
bool mPassBackToChildren;
|
|
};
|
|
|
|
|
|
#endif // LL_LLSCROLLCONTAINER_H
|