Commit 36aae9ce02ca53efa7c868888afec7be0b09d0b2
1 parent
663943a375
Exists in
master
and in
2 other branches
바삭함 주기 중 문 열림/닫힘 애니메이션 및 후속 과정 선택 화면 감춤
Showing
1 changed file
with
29 additions
and
2 deletions
Show diff stats
app/gui/oven_control/autocookwindow.cpp
| @@ -220,7 +220,32 @@ void AutoCookWindow::updateView() | @@ -220,7 +220,32 @@ void AutoCookWindow::updateView() | ||
| 220 | 220 | ||
| 221 | if (autocook.done()) | 221 | if (autocook.done()) |
| 222 | { | 222 | { |
| 223 | - if (!oven->door()) | 223 | + if (processSelected) |
| 224 | + { | ||
| 225 | + if (ui->openDoorAnimation->isVisible()) | ||
| 226 | + ui->openDoorAnimation->hide(); | ||
| 227 | + | ||
| 228 | + if (ui->openDoorArrow->isVisible()) | ||
| 229 | + ui->openDoorArrow->hide(); | ||
| 230 | + | ||
| 231 | + if (oven->door()) | ||
| 232 | + { | ||
| 233 | + if (ui->closeDoorAnimation->isVisible()) | ||
| 234 | + ui->closeDoorAnimation->hide(); | ||
| 235 | + | ||
| 236 | + if (ui->closeDoorArrow->isVisible()) | ||
| 237 | + ui->closeDoorArrow->hide(); | ||
| 238 | + } | ||
| 239 | + else | ||
| 240 | + { | ||
| 241 | + if (ui->closeDoorAnimation->isVisible()) | ||
| 242 | + ui->closeDoorAnimation->hide(); | ||
| 243 | + | ||
| 244 | + if (ui->closeDoorArrow->isVisible()) | ||
| 245 | + ui->closeDoorArrow->hide(); | ||
| 246 | + } | ||
| 247 | + } | ||
| 248 | + else if (!oven->door()) | ||
| 224 | { | 249 | { |
| 225 | if (ui->openDoorAnimation->isHidden()) | 250 | if (ui->openDoorAnimation->isHidden()) |
| 226 | ui->openDoorAnimation->show(); | 251 | ui->openDoorAnimation->show(); |
| @@ -249,7 +274,9 @@ void AutoCookWindow::updateView() | @@ -249,7 +274,9 @@ void AutoCookWindow::updateView() | ||
| 249 | ui->closeDoorArrow->hide(); | 274 | ui->closeDoorArrow->hide(); |
| 250 | } | 275 | } |
| 251 | 276 | ||
| 252 | - if (ui->processContainer->isHidden()) | 277 | + if (processSelected) |
| 278 | + ui->processContainer->hide(); | ||
| 279 | + else if (ui->processContainer->isHidden()) | ||
| 253 | ui->processContainer->show(); | 280 | ui->processContainer->show(); |
| 254 | } | 281 | } |
| 255 | else if (autocook.isWaitingDoorOpened() && !oven->door()) | 282 | else if (autocook.isWaitingDoorOpened() && !oven->door()) |