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

Refactored some TreeView key handling. Introjucer: now restores the last set of open documents for a project.

Browse source
This commit is contained in:
jules 2012-07-08 15:05:55 +01:00
parent 3d72789127
commit 25e7361f2c
13 changed files with 309 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

164
modules/juce_gui_basics/widgets/juce_TreeView.cpp
View file

@ -761,86 +761,100 @@ void TreeView::scrollToKeepItemVisible (TreeViewItem* item)
}
}
void TreeView::toggleOpenSelectedItem()
{
TreeViewItem* const firstSelected = getSelectedItem (0);
if (firstSelected != nullptr)
firstSelected->setOpen (! firstSelected->isOpen());
}
void TreeView::moveOutOfSelectedItem()
{
TreeViewItem* const firstSelected = getSelectedItem (0);
if (firstSelected != nullptr)
{
if (firstSelected->isOpen())
{
firstSelected->setOpen (false);
}
else
{
TreeViewItem* parent = firstSelected->parentItem;
if ((! rootItemVisible) && parent == rootItem)
parent = nullptr;
if (parent != nullptr)
{
parent->setSelected (true, true);
scrollToKeepItemVisible (parent);
}
}
}
}
void TreeView::moveIntoSelectedItem()
{
TreeViewItem* const firstSelected = getSelectedItem (0);
if (firstSelected != nullptr)
{
if (firstSelected->isOpen() || ! firstSelected->mightContainSubItems())
moveSelectedRow (1);
else
firstSelected->setOpen (true);
}
}
void TreeView::moveByPages (int numPages)
{
TreeViewItem* currentItem = getSelectedItem (0);
if (currentItem != nullptr)
{
const Rectangle<int> pos (currentItem->getItemPosition (false));
const int targetY = pos.getY() + numPages * (getHeight() - pos.getHeight());
int currentRow = currentItem->getRowNumberInTree();
for (;;)
{
moveSelectedRow (numPages);
currentItem = getSelectedItem (0);
if (currentItem == nullptr)
break;
const int y = currentItem->getItemPosition (false).getY();
if ((numPages < 0 && y <= targetY) || (numPages > 0 && y >= targetY))
break;
const int newRow = currentItem->getRowNumberInTree();
if (newRow == currentRow)
break;
currentRow = newRow;
}
}
}
bool TreeView::keyPressed (const KeyPress& key)
{
if (key.isKeyCode (KeyPress::upKey))
if (rootItem != nullptr
&& ! key.getModifiers().testFlags (ModifierKeys::ctrlAltCommandModifiers))
{
moveSelectedRow (-1);
}
else if (key.isKeyCode (KeyPress::downKey))
{
moveSelectedRow (1);
}
else if (key.isKeyCode (KeyPress::pageDownKey) || key.isKeyCode (KeyPress::pageUpKey))
{
if (rootItem != nullptr)
{
int rowsOnScreen = getHeight() / jmax (1, rootItem->itemHeight);
if (key.isKeyCode (KeyPress::pageUpKey))
rowsOnScreen = -rowsOnScreen;
if (rowsOnScreen != 0)
moveSelectedRow (rowsOnScreen);
}
}
else if (key.isKeyCode (KeyPress::homeKey))
{
moveSelectedRow (-0x3fffffff);
}
else if (key.isKeyCode (KeyPress::endKey))
{
moveSelectedRow (0x3fffffff);
}
else if (key.isKeyCode (KeyPress::returnKey))
{
TreeViewItem* const firstSelected = getSelectedItem (0);
if (firstSelected != nullptr)
firstSelected->setOpen (! firstSelected->isOpen());
}
else if (key.isKeyCode (KeyPress::leftKey))
{
TreeViewItem* const firstSelected = getSelectedItem (0);
if (firstSelected != nullptr)
{
if (firstSelected->isOpen())
{
firstSelected->setOpen (false);
}
else
{
TreeViewItem* parent = firstSelected->parentItem;
if ((! rootItemVisible) && parent == rootItem)
parent = nullptr;
if (parent != nullptr)
{
parent->setSelected (true, true);
scrollToKeepItemVisible (parent);
}
}
}
}
else if (key.isKeyCode (KeyPress::rightKey))
{
TreeViewItem* const firstSelected = getSelectedItem (0);
if (firstSelected != nullptr)
{
if (firstSelected->isOpen() || ! firstSelected->mightContainSubItems())
moveSelectedRow (1);
else
firstSelected->setOpen (true);
}
}
else
{
return false;
if (key.getKeyCode() == KeyPress::upKey) { moveSelectedRow (-1); return true; }
if (key.getKeyCode() == KeyPress::downKey) { moveSelectedRow (1); return true; }
if (key.getKeyCode() == KeyPress::homeKey) { moveSelectedRow (-0x3fffffff); return true; }
if (key.getKeyCode() == KeyPress::endKey) { moveSelectedRow (0x3fffffff); return true; }
if (key.getKeyCode() == KeyPress::pageUpKey) { moveByPages (-1); return true; }
if (key.getKeyCode() == KeyPress::pageDownKey) { moveByPages (1); return true; }
if (key.getKeyCode() == KeyPress::returnKey) { toggleOpenSelectedItem(); return true; }
if (key.getKeyCode() == KeyPress::leftKey) { moveOutOfSelectedItem(); return true; }
if (key.getKeyCode() == KeyPress::rightKey) { moveIntoSelectedItem(); return true; }
}
return true;
return false;
}
void TreeView::itemsChanged() noexcept