Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Testicular Slingshot
Alchemy Viewer
Commits
936eb81d
Commit
936eb81d
authored
Feb 19, 2020
by
Rye Mutt
🍞
Browse files
Merge branch 'master' of
https://git.alchemyviewer.org/alchemy/alchemy
parents
ee12a00e
535b66e6
Changes
1
Hide whitespace changes
Inline
Side-by-side
indra/llui/llscrolllistctrl.cpp
View file @
936eb81d
...
...
@@ -399,7 +399,7 @@ LLScrollListItem* LLScrollListCtrl::getFirstSelected() const
for
(
iter
=
mItemList
.
begin
();
iter
!=
mItemList
.
end
();
iter
++
)
{
LLScrollListItem
*
item
=
*
iter
;
if
(
item
&&
item
->
getSelected
())
if
(
item
->
getSelected
())
{
return
item
;
}
...
...
@@ -414,7 +414,7 @@ std::vector<LLScrollListItem*> LLScrollListCtrl::getAllSelected() const
for
(
iter
=
mItemList
.
begin
();
iter
!=
mItemList
.
end
();
iter
++
)
{
LLScrollListItem
*
item
=
*
iter
;
if
(
item
&&
item
->
getSelected
())
if
(
item
->
getSelected
())
{
ret
.
push_back
(
item
);
}
...
...
@@ -429,7 +429,7 @@ S32 LLScrollListCtrl::getNumSelected() const
for
(
item_list
::
const_iterator
iter
=
mItemList
.
begin
();
iter
!=
mItemList
.
end
();
++
iter
)
{
LLScrollListItem
*
item
=
*
iter
;
if
(
item
&&
item
->
getSelected
())
if
(
item
->
getSelected
())
{
++
numSelected
;
}
...
...
@@ -449,7 +449,7 @@ S32 LLScrollListCtrl::getFirstSelectedIndex() const
for
(
iter
=
mItemList
.
begin
();
iter
!=
mItemList
.
end
();
iter
++
)
{
LLScrollListItem
*
item
=
*
iter
;
if
(
item
&&
item
->
getSelected
())
if
(
item
->
getSelected
())
{
return
CurSelectedIndex
;
}
...
...
@@ -499,7 +499,7 @@ LLScrollListItem* LLScrollListCtrl::getItem(const LLSD& sd) const
{
LLScrollListItem
*
item
=
*
iter
;
// assumes string representation is good enough for comparison
if
(
item
&&
item
->
getValue
().
asString
()
==
string_val
)
if
(
item
->
getValue
().
asString
()
==
string_val
)
{
return
item
;
}
...
...
@@ -653,7 +653,6 @@ S32 LLScrollListCtrl::calcMaxContentWidth()
item_list
::
iterator
iter
;
for
(
iter
=
mItemList
.
begin
();
iter
!=
mItemList
.
end
();
iter
++
)
{
if
(
!
(
*
iter
))
continue
;
LLScrollListCell
*
cellp
=
(
*
iter
)
->
getColumn
(
column
->
mIndex
);
if
(
!
cellp
)
continue
;
...
...
@@ -793,11 +792,6 @@ void LLScrollListCtrl::updateColumns(bool force_update)
for
(
iter
=
mItemList
.
begin
();
iter
!=
mItemList
.
end
();
iter
++
)
{
LLScrollListItem
*
itemp
=
*
iter
;
if
(
!
itemp
)
{
continue
;
}
S32
num_cols
=
itemp
->
getNumColumns
();
S32
i
=
0
;
for
(
LLScrollListCell
*
cell
=
itemp
->
getColumn
(
i
);
i
<
num_cols
;
cell
=
itemp
->
getColumn
(
++
i
))
...
...
@@ -835,7 +829,7 @@ BOOL LLScrollListCtrl::selectFirstItem()
for
(
iter
=
mItemList
.
begin
();
iter
!=
mItemList
.
end
();
iter
++
)
{
LLScrollListItem
*
itemp
=
*
iter
;
if
(
first_item
&&
itemp
&&
itemp
->
getEnabled
()
)
if
(
first_item
&&
itemp
->
getEnabled
()
)
{
if
(
!
itemp
->
getSelected
())
{
...
...
@@ -976,7 +970,7 @@ void LLScrollListCtrl::deleteItems(const LLSD& sd)
for
(
iter
=
mItemList
.
begin
();
iter
<
mItemList
.
end
();
)
{
LLScrollListItem
*
itemp
=
*
iter
;
if
(
itemp
&&
itemp
->
getValue
().
asString
()
==
sd
.
asString
())
if
(
itemp
->
getValue
().
asString
()
==
sd
.
asString
())
{
if
(
itemp
==
mLastSelected
)
{
...
...
@@ -1000,7 +994,7 @@ void LLScrollListCtrl::deleteSelectedItems()
for
(
iter
=
mItemList
.
begin
();
iter
<
mItemList
.
end
();
)
{
LLScrollListItem
*
itemp
=
*
iter
;
if
(
itemp
&&
itemp
->
getSelected
())
if
(
itemp
->
getSelected
())
{
delete
itemp
;
iter
=
mItemList
.
erase
(
iter
);
...
...
@@ -1084,7 +1078,7 @@ S32 LLScrollListCtrl::getItemIndex( const LLUUID& target_id ) const
for
(
iter
=
mItemList
.
begin
();
iter
!=
mItemList
.
end
();
iter
++
)
{
LLScrollListItem
*
itemp
=
*
iter
;
if
(
itemp
&&
target_id
==
itemp
->
getUUID
())
if
(
target_id
==
itemp
->
getUUID
())
{
return
index
;
}
...
...
@@ -1111,7 +1105,7 @@ void LLScrollListCtrl::selectPrevItem( BOOL extend_selection)
{
LLScrollListItem
*
cur_item
=
*
iter
;
if
(
cur_item
&&
cur_item
->
getSelected
())
if
(
cur_item
->
getSelected
())
{
if
(
prev_item
)
{
...
...
@@ -1125,7 +1119,7 @@ void LLScrollListCtrl::selectPrevItem( BOOL extend_selection)
}
// don't allow navigation to disabled elements
prev_item
=
(
cur_item
&&
cur_item
->
getEnabled
()
)
?
cur_item
:
prev_item
;
prev_item
=
cur_item
->
getEnabled
()
?
cur_item
:
prev_item
;
}
}
...
...
@@ -1155,7 +1149,7 @@ void LLScrollListCtrl::selectNextItem( BOOL extend_selection)
{
LLScrollListItem
*
cur_item
=
*
iter
;
if
(
cur_item
&&
cur_item
->
getSelected
())
if
(
cur_item
->
getSelected
())
{
if
(
next_item
)
{
...
...
@@ -1169,7 +1163,7 @@ void LLScrollListCtrl::selectNextItem( BOOL extend_selection)
}
// don't allow navigation to disabled items
next_item
=
(
cur_item
&&
cur_item
->
getEnabled
()
)
?
cur_item
:
next_item
;
next_item
=
cur_item
->
getEnabled
()
?
cur_item
:
next_item
;
}
}
...
...
@@ -1258,11 +1252,6 @@ LLScrollListItem* LLScrollListCtrl::getItemByLabel(const std::string& label, BOO
for
(
iter
=
mItemList
.
begin
();
iter
!=
mItemList
.
end
();
iter
++
)
{
LLScrollListItem
*
item
=
*
iter
;
if
(
!
item
)
{
continue
;
}
std
::
string
item_text
=
item
->
getColumn
(
column
)
->
getValue
().
asString
();
// Only select enabled items with matching names
if
(
!
case_sensitive
)
{
...
...
@@ -1298,11 +1287,6 @@ BOOL LLScrollListCtrl::selectItemByPrefix(const LLWString& target, BOOL case_sen
for
(
iter
=
mItemList
.
begin
();
iter
!=
mItemList
.
end
();
iter
++
)
{
LLScrollListItem
*
item
=
*
iter
;
if
(
!
item
)
{
continue
;
}
// Only select enabled items with matching names
LLScrollListCell
*
cellp
=
item
->
getColumn
(
getSearchColumn
());
BOOL
select
=
cellp
?
item
->
getEnabled
()
&&
(
'\0'
==
cellp
->
getValue
().
asString
()[
0
])
:
FALSE
;
...
...
@@ -1415,7 +1399,7 @@ BOOL LLScrollListCtrl::setSelectedByValue(const LLSD& value, BOOL selected)
for
(
iter
=
mItemList
.
begin
();
iter
!=
mItemList
.
end
();
iter
++
)
{
LLScrollListItem
*
item
=
*
iter
;
if
(
item
&&
item
->
getEnabled
()
&&
(
item
->
getValue
().
asString
()
==
value
.
asString
()))
if
(
item
->
getEnabled
()
&&
(
item
->
getValue
().
asString
()
==
value
.
asString
()))
{
if
(
selected
)
{
...
...
@@ -1444,7 +1428,7 @@ BOOL LLScrollListCtrl::isSelected(const LLSD& value) const
for
(
iter
=
mItemList
.
begin
();
iter
!=
mItemList
.
end
();
iter
++
)
{
LLScrollListItem
*
item
=
*
iter
;
if
(
item
&&
item
->
getValue
().
asString
()
==
value
.
asString
())
if
(
item
->
getValue
().
asString
()
==
value
.
asString
())
{
return
item
->
getSelected
();
}
...
...
@@ -1513,10 +1497,6 @@ void LLScrollListCtrl::drawItems()
for
(
S32
line
=
first_line
;
line
<=
last_line
;
line
++
)
{
LLScrollListItem
*
item
=
mItemList
[
line
];
if
(
!
item
)
{
continue
;
}
item_rect
.
setOriginAndSize
(
x
,
...
...
@@ -2115,7 +2095,7 @@ LLScrollListItem* LLScrollListCtrl::hitItem( S32 x, S32 y )
LLScrollListItem
*
item
=
*
iter
;
if
(
mScrollLines
<=
line
&&
line
<
mScrollLines
+
num_page_lines
)
{
if
(
item
&&
item
->
getEnabled
()
&&
item_rect
.
pointInRect
(
x
,
y
)
)
if
(
item
->
getEnabled
()
&&
item_rect
.
pointInRect
(
x
,
y
)
)
{
hit_item
=
item
;
break
;
...
...
@@ -2408,28 +2388,26 @@ BOOL LLScrollListCtrl::handleUnicodeCharHere(llwchar uni_char)
while
(
iter
!=
start_iter
)
{
LLScrollListItem
*
item
=
*
iter
;
if
(
item
)
LLScrollListCell
*
cellp
=
item
->
getColumn
(
getSearchColumn
());
if
(
cellp
)
{
LLScrollListCell
*
cellp
=
item
->
getColumn
(
getSearchColumn
());
if
(
cellp
)
// Only select enabled items with matching first characters
LLWString
item_label
=
utf8str_to_wstring
(
cellp
->
getValue
().
asString
());
if
(
item
->
getEnabled
()
&&
LLStringOps
::
toLower
(
item_label
[
0
])
==
uni_char
)
{
// Only select enabled items with matching first characters
LLWString
item_label
=
utf8str_to_wstring
(
cellp
->
getValue
().
asString
());
if
(
item
->
getEnabled
()
&&
LLStringOps
::
toLower
(
item_label
[
0
])
==
uni_char
)
{
selectItem
(
item
);
mNeedsScroll
=
true
;
cellp
->
highlightText
(
0
,
1
);
mSearchTimer
.
reset
();
if
(
mCommitOnKeyboardMovement
&&
!
mCommitOnSelectionChange
)
{
onCommit
();
}
selectItem
(
item
);
mNeedsScroll
=
true
;
cellp
->
highlightText
(
0
,
1
);
mSearchTimer
.
reset
();
break
;
if
(
mCommitOnKeyboardMovement
&&
!
mCommitOnSelectionChange
)
{
onCommit
();
}
break
;
}
}
...
...
@@ -2747,7 +2725,7 @@ void LLScrollListCtrl::selectAll()
for
(
iter
=
mItemList
.
begin
();
iter
!=
mItemList
.
end
();
iter
++
)
{
LLScrollListItem
*
itemp
=
*
iter
;
if
(
itemp
&&
itemp
->
getEnabled
()
)
if
(
itemp
->
getEnabled
()
)
{
selectItem
(
itemp
,
FALSE
);
}
...
...
@@ -2879,13 +2857,11 @@ void LLScrollListCtrl::onClickColumn(void *userdata)
S32
column_index
=
info
->
mIndex
;
LLScrollListColumn
*
column
=
parent
->
mColumnsIndexed
[
info
->
mIndex
];
if
(
!
column
)
return
;
bool
ascending
=
column
->
mSortDirection
==
LLScrollListColumn
::
ASCENDING
;
if
(
column
->
mSortingColumn
!=
column
->
mName
&&
parent
->
mColumns
.
find
(
column
->
mSortingColumn
)
!=
parent
->
mColumns
.
end
())
{
LLScrollListColumn
*
info_redir
=
parent
->
mColumns
[
column
->
mSortingColumn
];
if
(
!
info_redir
)
return
;
column_index
=
info_redir
->
mIndex
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment