mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-07-05 07:24:39 +00:00
Code Issues Releases Wiki Activity

Fix some oversights in the animation editor that wrongly occured during text input.

Browse source
This commit is contained in:
fgenesis 2012-05-05 16:53:53 +02:00
parent 8b80af432a
commit 5cef84ad9d
1 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Aquaria/AnimationEditor.cpp
View file

@ -1311,6 +1311,8 @@ void AnimationEditor::moveNextWidgets(float dt)
void AnimationEditor::toggleRenderBorders() void AnimationEditor::toggleRenderBorders()
{ {
if (dsq->isNested()) return;
renderBorders = !renderBorders; renderBorders = !renderBorders;
updateRenderBorders(); updateRenderBorders();
} }
@ -1336,18 +1338,24 @@ void AnimationEditor::updateEditingBone()
void AnimationEditor::showAllBones() void AnimationEditor::showAllBones()
{ {
if (dsq->isNested()) return;
for (size_t i = 0; i < editSprite->bones.size(); ++i) for (size_t i = 0; i < editSprite->bones.size(); ++i)
editSprite->bones[i]->renderQuad = true; editSprite->bones[i]->renderQuad = true;
} }
void AnimationEditor::incrTimelineUnit() void AnimationEditor::incrTimelineUnit()
{ {
if (dsq->isNested()) return;
TIMELINE_UNIT += TIMELINE_UNIT_STEP; TIMELINE_UNIT += TIMELINE_UNIT_STEP;
updateTimelineUnit(); updateTimelineUnit();
} }
void AnimationEditor::decrTimelineUnit() void AnimationEditor::decrTimelineUnit()
{ {
if (dsq->isNested()) return;
float t = TIMELINE_UNIT - TIMELINE_UNIT_STEP; float t = TIMELINE_UNIT - TIMELINE_UNIT_STEP;
if (t >= TIMELINE_UNIT_STEP) if (t >= TIMELINE_UNIT_STEP)
TIMELINE_UNIT = t; TIMELINE_UNIT = t;
@ -1363,12 +1371,16 @@ void AnimationEditor::updateTimelineUnit()
void AnimationEditor::incrTimelineGrid() void AnimationEditor::incrTimelineGrid()
{ {
if (dsq->isNested()) return;
TIMELINE_GRIDSIZE++; TIMELINE_GRIDSIZE++;
updateTimelineGrid(); updateTimelineGrid();
} }
void AnimationEditor::decrTimelineGrid() void AnimationEditor::decrTimelineGrid()
{ {
if (dsq->isNested()) return;
int t = TIMELINE_GRIDSIZE - 1; int t = TIMELINE_GRIDSIZE - 1;
if (t > 0) if (t > 0)
TIMELINE_GRIDSIZE = t; TIMELINE_GRIDSIZE = t;