mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-22 01:34:21 +00:00
Code Activity

Added a few methods to Rectangle. Small fix for ValueTrees.

Browse source
This commit is contained in:
Julian Storer 2010-06-16 10:55:00 +01:00
parent 2df522076b
commit fab2c76194
19 changed files with 345 additions and 77 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/containers/juce_ValueTree.cpp
View file

@ -160,9 +160,9 @@ private:
class ValueTree::MoveChildAction : public UndoableAction
{
public:
MoveChildAction (const SharedObjectPtr& target_,
MoveChildAction (const SharedObjectPtr& parent_,
const int startIndex_, const int endIndex_)
: target (target_),
: parent (parent_),
startIndex (startIndex_),
endIndex (endIndex_)
{
@ -172,13 +172,13 @@ public:
bool perform()
{
target->moveChild (startIndex, endIndex, 0);
parent->moveChild (startIndex, endIndex, 0);
return true;
}
bool undo()
{
target->moveChild (endIndex, startIndex, 0);
parent->moveChild (endIndex, startIndex, 0);
return true;
}
@ -191,14 +191,14 @@ public:
{
MoveChildAction* next = dynamic_cast <MoveChildAction*> (nextAction);
if (next != 0 && next->target == target && next->child == child)
return new MoveChildAction (target, startIndex, next->endIndex);
if (next != 0 && next->parent == parent && next->startIndex == endIndex)
return new MoveChildAction (parent, startIndex, next->endIndex);
return 0;
}
private:
const SharedObjectPtr target, child;
const SharedObjectPtr parent;
const int startIndex, endIndex;
MoveChildAction (const MoveChildAction&);