Skip to content
Snippets Groups Projects
Commit 967652a7 authored by skolb's avatar skolb
Browse files

Merge

parents c9a70e86 39700f10
No related branches found
No related tags found
No related merge requests found
...@@ -330,6 +330,7 @@ BOOL LLFolderView::addFolder( LLFolderViewFolder* folder) ...@@ -330,6 +330,7 @@ BOOL LLFolderView::addFolder( LLFolderViewFolder* folder)
else else
{ {
mFolders.insert(mFolders.begin(), folder); mFolders.insert(mFolders.begin(), folder);
folder->setShowLoadStatus(true);
} }
folder->setOrigin(0, 0); folder->setOrigin(0, 0);
folder->reshape(getRect().getWidth(), 0); folder->reshape(getRect().getWidth(), 0);
......
...@@ -136,7 +136,8 @@ LLFolderViewItem::LLFolderViewItem(LLFolderViewItem::Params p) ...@@ -136,7 +136,8 @@ LLFolderViewItem::LLFolderViewItem(LLFolderViewItem::Params p)
mListener(p.listener), mListener(p.listener),
mArrowImage(p.folder_arrow_image), mArrowImage(p.folder_arrow_image),
mBoxImage(p.selection_image), mBoxImage(p.selection_image),
mDontShowInHierarchy(false) mDontShowInHierarchy(false),
mShowLoadStatus(false)
{ {
refresh(); refresh();
} }
...@@ -966,10 +967,11 @@ void LLFolderViewItem::draw() ...@@ -966,10 +967,11 @@ void LLFolderViewItem::draw()
} }
if ( mIsLoading if ( (mIsLoading && mTimeSinceRequestStart.getElapsedTimeF32() >= gSavedSettings.getF32("FolderLoadingMessageWaitTime"))
&& mTimeSinceRequestStart.getElapsedTimeF32() >= gSavedSettings.getF32("FolderLoadingMessageWaitTime") ) || (LLInventoryModel::backgroundFetchActive() && mShowLoadStatus) )
{ {
font->renderUTF8(LLTrans::getString("LoadingData"), 0, text_left, y, sSearchStatusColor, std::string load_string = LLTrans::getString("LoadingData") + " ";
font->renderUTF8(load_string, 0, text_left, y, sSearchStatusColor,
LLFontGL::LEFT, LLFontGL::BOTTOM, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, S32_MAX, S32_MAX, &right_x, FALSE); LLFontGL::LEFT, LLFontGL::BOTTOM, LLFontGL::NORMAL, LLFontGL::NO_SHADOW, S32_MAX, S32_MAX, &right_x, FALSE);
text_left = right_x; text_left = right_x;
} }
......
...@@ -163,6 +163,7 @@ class LLFolderViewItem : public LLView ...@@ -163,6 +163,7 @@ class LLFolderViewItem : public LLView
BOOL mIsLoading; BOOL mIsLoading;
LLTimer mTimeSinceRequestStart; LLTimer mTimeSinceRequestStart;
bool mDontShowInHierarchy; bool mDontShowInHierarchy;
bool mShowLoadStatus;
// helper function to change the selection from the root. // helper function to change the selection from the root.
void changeSelectionFromRoot(LLFolderViewItem* selection, BOOL selected); void changeSelectionFromRoot(LLFolderViewItem* selection, BOOL selected);
...@@ -254,6 +255,8 @@ class LLFolderViewItem : public LLView ...@@ -254,6 +255,8 @@ class LLFolderViewItem : public LLView
BOOL getIsCurSelection() { return mIsCurSelection; } BOOL getIsCurSelection() { return mIsCurSelection; }
BOOL hasVisibleChildren() { return mHasVisibleChildren; } BOOL hasVisibleChildren() { return mHasVisibleChildren; }
void setShowLoadStatus(bool status) { mShowLoadStatus = status; }
// Call through to the viewed object and return true if it can be // Call through to the viewed object and return true if it can be
// removed. Returns true if it's removed. // removed. Returns true if it's removed.
......
...@@ -378,7 +378,7 @@ ...@@ -378,7 +378,7 @@
reference="White_25" /> reference="White_25" />
<color <color
name="InventorySearchStatusColor" name="InventorySearchStatusColor"
reference="Black" /> reference="EmphasisColor" />
<color <color
name="LabelDisabledColor" name="LabelDisabledColor"
reference="White_25" /> reference="White_25" />
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment