Changeset 3728 for pjproject/trunk/pjsip-apps/src/vidgui/vidwin.cpp

Timestamp:

Aug 29, 2011 2:33:50 AM (13 years ago)

Author:

ming

Message:

Fixed #1354: stopping preview may hide parent window.

File:

• pjproject/trunk/pjsip-apps/src/vidgui/vidwin.cpp (modified) (7 diffs)

pjproject/trunk/pjsip-apps/src/vidgui/vidwin.cpp

@@ -47 +47 @@
 VidWin::~VidWin()
 {
-    show(false);
+    show_sdl(false);
     detach();
 }
@@ -73 +73 @@
 
     case QEvent::Show:
-        show(true);
+        show_sdl(true);
         // revert to default size hint, make it resizable
         setFixedSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX);
@@ -79 +79 @@
 
     case QEvent::Hide:
-        show(false);
+        show_sdl(false);
         break;
 
@@ -139 +139 @@
 }
 
-void VidWin::show(bool visible)
+void VidWin::show_sdl(bool visible)
 {
     if (!hwnd.info.win.hwnd) return;
@@ -210 +210 @@
 }
 
-void VidWin::show(bool visible)
+void VidWin::show_sdl(bool visible)
 {
     if (!hwnd.info.cocoa.window) return;
@@ -217 +217 @@
 
     if (visible) {
-        if (![w isMiniaturized]) {
-            [w makeKeyAndOrderFront:nil];
-        }
+        [[w contentView]setHidden:NO];
     } else {
-        [w orderOut:nil];
+        [[w contentView]setHidden:YES];
     }
 }
@@ -285 +283 @@
 }
 
-void VidWin::show(bool visible)
+void VidWin::show_sdl(bool visible)
 {
     if (!hwnd.info.x11.window) return;