mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-02-04 03:40:07 +00:00
Code Activity

Changed SparseSet to work with Range objects. Fixed array sorting bug.

Browse source
This commit is contained in:
Julian Storer 2010-04-26 12:00:36 +01:00
parent 21006fbd0a
commit 9c5651fb8e
14 changed files with 251 additions and 310 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/gui/components/controls/juce_ListBox.cpp
View file

@ -128,7 +128,7 @@ public:
{
if (isEnabled() && owner.getModel() != 0 && ! (e.mouseWasClicked() || isDragging))
{
const SparseSet <int> selectedRows (owner.getSelectedRows());
const SparseSet<int> selectedRows (owner.getSelectedRows());
if (selectedRows.size() > 0)
{
@ -426,7 +426,7 @@ void ListBox::updateContent()
if (selected [selected.size() - 1] >= totalItems)
{
selected.removeRange (totalItems, std::numeric_limits<int>::max() - totalItems);
selected.removeRange (Range <int> (totalItems, std::numeric_limits<int>::max()));
lastRowSelected = getSelectedRow (0);
selectionChanged = true;
}
@ -462,7 +462,7 @@ void ListBox::selectRowInternal (const int row,
if (deselectOthersFirst)
selected.clear();
selected.addRange (row, 1);
selected.addRange (Range<int> (row, row + 1));
if (getHeight() == 0 || getWidth() == 0)
dontScroll = true;
@ -511,7 +511,7 @@ void ListBox::deselectRow (const int row)
{
if (selected.contains (row))
{
selected.removeRange (row, 1);
selected.removeRange (Range <int> (row, row + 1));
if (row == lastRowSelected)
lastRowSelected = getSelectedRow (0);
@ -525,7 +525,7 @@ void ListBox::setSelectedRows (const SparseSet<int>& setOfRowsToBeSelected,
const bool sendNotificationEventToModel)
{
selected = setOfRowsToBeSelected;
selected.removeRange (totalItems, std::numeric_limits<int>::max() - totalItems);
selected.removeRange (Range <int> (totalItems, std::numeric_limits<int>::max()));
if (! isRowSelected (lastRowSelected))
lastRowSelected = getSelectedRow (0);
@ -549,10 +549,10 @@ void ListBox::selectRangeOfRows (int firstRow, int lastRow)
firstRow = jlimit (0, jmax (0, numRows), firstRow);
lastRow = jlimit (0, jmax (0, numRows), lastRow);
selected.addRange (jmin (firstRow, lastRow),
abs (firstRow - lastRow) + 1);
selected.addRange (Range <int> (jmin (firstRow, lastRow),
jmax (firstRow, lastRow) + 1));
selected.removeRange (lastRow, 1);
selected.removeRange (Range <int> (lastRow, lastRow + 1));
}
selectRowInternal (lastRow, false, false, true);

2
src/gui/components/controls/juce_TableListBox.cpp
View file

@ -191,7 +191,7 @@ public:
{
if (isEnabled() && owner.getModel() != 0 && ! (e.mouseWasClicked() || isDragging))
{
const SparseSet <int> selectedRows (owner.getSelectedRows());
const SparseSet<int> selectedRows (owner.getSelectedRows());
if (selectedRows.size() > 0)
{