aboutsummaryrefslogtreecommitdiff
path: root/src/client/views/GlobalKeyHandler.ts
diff options
context:
space:
mode:
authorbobzel <zzzman@gmail.com>2024-01-04 13:11:22 -0500
committerbobzel <zzzman@gmail.com>2024-01-04 13:11:22 -0500
commitae27dd1689ae1716591aab094e6d41f3a0160fef (patch)
tree09735c798abde4fd0b8f234c48375bd6cb1112a4 /src/client/views/GlobalKeyHandler.ts
parentebf32ac65d35053f847fb2cf60f915eb29d6fdd5 (diff)
fixed ffmpeg for uploading videos. fixed getView() to take focus options so that if a sidebar or timeline has to be opened, the didMove flag can be set properly. added video snapshot frame to top menu. fixed using '^' to stop and start a selection region on timelines.
Diffstat (limited to 'src/client/views/GlobalKeyHandler.ts')
-rw-r--r--src/client/views/GlobalKeyHandler.ts8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/client/views/GlobalKeyHandler.ts b/src/client/views/GlobalKeyHandler.ts
index 77b831e51..d134d9e7b 100644
--- a/src/client/views/GlobalKeyHandler.ts
+++ b/src/client/views/GlobalKeyHandler.ts
@@ -128,10 +128,12 @@ export class KeyManager {
var doDeselect = true;
if (SnappingManager.IsDragging) {
DragManager.AbortDrag();
- } else if (CollectionDockingView.Instance?.HasFullScreen) {
+ }
+ if (CollectionDockingView.Instance?.HasFullScreen) {
CollectionDockingView.Instance?.CloseFullScreen();
- } else if (CollectionStackedTimeline.SelectingRegion) {
- CollectionStackedTimeline.SelectingRegion = undefined;
+ }
+ if (CollectionStackedTimeline.SelectingRegions.size) {
+ CollectionStackedTimeline.StopSelecting();
doDeselect = false;
} else {
doDeselect = !ContextMenu.Instance.closeMenu();