History

We should let people "start" even if the animation is already playing (to start again from the beginning). Fixed an issue with competing priorities.

Andrzej Kapolka committed 12 years ago

Commit a32dfdb1 parent 5b654064 files · +28 −23Browse files

Showing the changes to interface/src/ui/AnimationsDialog.cpp (1 of 4 files). Show all

Unified · Split

interface/src/ui/AnimationsDialog.cpp+2−7
@@ -148,8 +148,8 @@ AnimationPanel::AnimationPanel(AnimationsDialog* dialog, const AnimationHandlePo · 147 unmodified lines
148 buttons->addWidget(remove);148 buttons->addWidget(remove);
149 connect(remove, SIGNAL(clicked(bool)), SLOT(removeHandle()));149 connect(remove, SIGNAL(clicked(bool)), SLOT(removeHandle()));
150 150
151 connect(_handle.data(), SIGNAL(runningChanged(bool)), SLOT(updateStartStop()));151 _stop->connect(_handle.data(), SIGNAL(runningChanged(bool)), SLOT(setEnabled(bool)));
152 updateStartStop();152 _stop->setEnabled(_handle->isRunning());
153}153}
154 154
155void AnimationPanel::chooseURL() {155void AnimationPanel::chooseURL() {
@@ -185,11 +185,6 @@ void AnimationPanel::chooseMaskedJoints() { · 29 unmodified lines
185 }185 }
186}186}
187 187
188void AnimationPanel::updateStartStop() {
189 _start->setEnabled(!_handle->isRunning());
190 _stop->setEnabled(_handle->isRunning());
191}
192
193void AnimationPanel::updateHandle() {188void AnimationPanel::updateHandle() {
194 _handle->setRole(_role->currentText());189 _handle->setRole(_role->currentText());
195 _handle->setURL(_url->text());190 _handle->setURL(_url->text());

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t