Commit 77dfae0
authored
SG-40929: Continued fixes based on QA. (AcademySoftwareFoundation#963)
### Summarize your change.
It turns out there were a few big holes in my previous PR for SG-40182.
* in rvui.mu and elsewhere, many bind() calls for keyboard events _(or
mouse inputs)_ that dont have equivalent menu item also needed
categorizations. There was a missing bind() overload in app_utils.mu. to
do this so it was added. This is by far the largest change.
* in app_utils.mu, calling the "compositeStateFunc()" could return
garbage (yet another mu bug, which I'm not fixing here) causing the
event func to be called even if the category was disabled. It was
replaced with a more straightforward check. (the bug seemed to happen
mostly if the handler func defined in menuItem() started with a leading
"~" before its name, eg, "~togglePlay")
* in mode_manager.mu, needed to add equivalent protections to
filterLiveReviewEvents() which got removed without an equivalent in the
shuffle.
* in annotate_mode.mu, needed to make disappear the paint tools if we
are in LR presenter mode (eg: annotate_categories is disabled)
* in scrub_offset.mu, needed to guard on scrubbing if playcontrol
category is disabled.
* more filterLiveReviewEvents were removed, and replaced with the
appropriate binding (or alternative to bind funcs)
---
Things to test,
*_when in viewer mode:...._*
- fix: stepForward 1 or 100 frames is now blocked
- fix: stepBackward 1 or 100 frames is now blocked
- fix: motion scope popup menu is blocked
- fix: clicking and dragging in timeline/ motion scope is blocked
- fix: marking frames in timeline is blocked
- fix: setting point in timeline is blocked
- fix: annotate panel is closed
- fix: cannot scrub in scrub_offset mode
- fix: rotate ibage is blocked
- fix: mousewheel to scrub is disabled
- fix: dragging in main view to scrub is blocked
- fix: doing space to play is blocked.
viewmode categories:
ViewMode Categories were off in viewer mode before, but enabled now.
(toggle this category in live_review.py)
viewmode key shortcuts:
- fix: kbd keys are blocked: M, alt-r, alt-l, shift-l, shift-r, ctrl-m,
down, p, pgup, pgdn.
- fix: kbd keys are blocked : aldkspmzvh,.<>OSorcR/
when in nudge mode...
- fix: kbd keys are blocked : left,right,up,down, control and shift
variations.
- fix: kbd keys are blocked : z, ctrl-z, alt-n,
### Describe the reason for the change.
Stephen reported a few problems reported with being able to do some
things in LR that he shouldnt be able to do when in muc presenter mode.
(participant = viewer)
### Describe what you have tested and on which operating system.
macOS
### Add a list of changes, and note any that might need special
attention during the review.
### If possible, provide screenshots.
---------
Signed-off-by: Patrick Bergeron <patrick.bergeron@autodesk.com>1 parent c03e7b1 commit 77dfae0
File tree
11 files changed
+202
-184
lines changed- src
- lib/app/mu_rvui
- plugins/rv-packages
- annotate
- scrub_offset
- session_manager
11 files changed
+202
-184
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
28 | 39 | | |
29 | 40 | | |
30 | 41 | | |
| |||
49 | 60 | | |
50 | 61 | | |
51 | 62 | | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
52 | 68 | | |
53 | 69 | | |
54 | 70 | | |
| |||
209 | 225 | | |
210 | 226 | | |
211 | 227 | | |
212 | | - | |
| 228 | + | |
213 | 229 | | |
214 | 230 | | |
215 | 231 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
91 | 91 | | |
92 | 92 | | |
93 | 93 | | |
| 94 | + | |
94 | 95 | | |
95 | 96 | | |
96 | 97 | | |
| |||
384 | 385 | | |
385 | 386 | | |
386 | 387 | | |
387 | | - | |
388 | | - | |
| 388 | + | |
| 389 | + | |
389 | 390 | | |
390 | 391 | | |
| 392 | + | |
391 | 393 | | |
392 | 394 | | |
393 | 395 | | |
394 | 396 | | |
395 | 397 | | |
396 | 398 | | |
397 | | - | |
398 | | - | |
| 399 | + | |
399 | 400 | | |
400 | | - | |
| 401 | + | |
401 | 402 | | |
402 | 403 | | |
403 | 404 | | |
| |||
462 | 463 | | |
463 | 464 | | |
464 | 465 | | |
465 | | - | |
466 | | - | |
| 466 | + | |
467 | 467 | | |
468 | | - | |
469 | 468 | | |
470 | 469 | | |
471 | 470 | | |
| |||
487 | 486 | | |
488 | 487 | | |
489 | 488 | | |
490 | | - | |
491 | | - | |
| 489 | + | |
492 | 490 | | |
493 | | - | |
| 491 | + | |
494 | 492 | | |
495 | 493 | | |
496 | 494 | | |
| |||
512 | 510 | | |
513 | 511 | | |
514 | 512 | | |
515 | | - | |
516 | | - | |
| 513 | + | |
517 | 514 | | |
518 | | - | |
| 515 | + | |
519 | 516 | | |
520 | 517 | | |
521 | 518 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
213 | 213 | | |
214 | 214 | | |
215 | 215 | | |
216 | | - | |
217 | | - | |
218 | | - | |
219 | | - | |
220 | | - | |
221 | | - | |
222 | | - | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
| 224 | + | |
| 225 | + | |
| 226 | + | |
| 227 | + | |
| 228 | + | |
| 229 | + | |
| 230 | + | |
| 231 | + | |
| 232 | + | |
| 233 | + | |
223 | 234 | | |
224 | 235 | | |
225 | 236 | | |
| |||
426 | 437 | | |
427 | 438 | | |
428 | 439 | | |
| 440 | + | |
| 441 | + | |
| 442 | + | |
| 443 | + | |
| 444 | + | |
| 445 | + | |
| 446 | + | |
| 447 | + | |
| 448 | + | |
| 449 | + | |
| 450 | + | |
| 451 | + | |
| 452 | + | |
429 | 453 | | |
430 | 454 | | |
431 | 455 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
376 | 376 | | |
377 | 377 | | |
378 | 378 | | |
379 | | - | |
380 | | - | |
381 | | - | |
382 | | - | |
383 | 379 | | |
384 | 380 | | |
385 | 381 | | |
| |||
704 | 700 | | |
705 | 701 | | |
706 | 702 | | |
707 | | - | |
708 | | - | |
709 | | - | |
710 | | - | |
711 | | - | |
712 | 703 | | |
713 | 704 | | |
714 | 705 | | |
| |||
890 | 881 | | |
891 | 882 | | |
892 | 883 | | |
893 | | - | |
894 | | - | |
895 | | - | |
896 | | - | |
897 | | - | |
| 884 | + | |
| 885 | + | |
| 886 | + | |
| 887 | + | |
| 888 | + | |
898 | 889 | | |
899 | 890 | | |
900 | 891 | | |
| |||
0 commit comments