FlightData: add GimbalVideoControl to map

ArduPilot · Nov 16, 2024 · f133b6f · f133b6f
1 parent 56dcb35
commit f133b6f
Show file tree

Hide file tree

Showing 5 changed files with 623 additions and 324 deletions.
diff --git a/Controls/GimbalVideoControl.Designer.cs b/Controls/GimbalVideoControl.Designer.cs
diff --git a/Controls/GimbalVideoControl.cs b/Controls/GimbalVideoControl.cs
@@ -238,9 +238,7 @@ protected override void Dispose(bool disposing)
         {
             if (disposing)
             {
-                _stream.OnNewImage -= RenderFrame;
-                _stream.Stop();
-
+                Stop();
                 if (components != null)
                 {
                     components.Dispose();
@@ -249,6 +247,12 @@ protected override void Dispose(bool disposing)
             base.Dispose(disposing);
         }
 
+        public void Stop()
+        {
+            _stream.OnNewImage -= RenderFrame;
+            _stream.Stop();
+        }
+
         private void videoStreamToolStripMenuItem_Click(object sender, EventArgs e)
         {
             GStreamer.GstLaunch = GStreamer.LookForGstreamer();
@@ -273,7 +277,7 @@ private void videoStreamToolStripMenuItem_Click(object sender, EventArgs e)
         public bool PreFilterMessage(ref Message m)
         {
             // Don't hog the keyboard when this control doesn't have focus
-            if (!ContainsFocus)
+            if (!(Parent?.ContainsFocus ?? false))
             {
                 if(heldKeys.Count > 0)
                 {
@@ -546,6 +550,9 @@ private void VideoBox_MouseLeave(object sender, EventArgs e)
 
         private void VideoBox_Click(object sender, EventArgs e)
         {
+            // Focus the control when clicked
+            VideoBox.Focus();
+
             MouseEventArgs me = (MouseEventArgs)e;
             var point = getMousePosition(me.X, me.Y);
             if (!point.HasValue)