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

Timestamp:

Aug 26, 2011 4:30:18 AM (13 years ago)

Author:

nanang

Message:

Re #1327:

• Vidgui UI updates on Qt must be done in the UI thread, implemented this with Qt signal-slot mechanism.
• VidWin::show() better be called internally by VidWin? class instead of MainWin?.
• Fix QString to const char* issue, keeping the pointer returned by "QString::to*()::data()" won't work, the pointer actually points to a temporary data (lifetime issue).
• Minor: cleaning up unused lines in vidgui.

File:

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

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

@@ -47 +47 @@
 VidWin::~VidWin()
 {
+    show(false);
     detach();
-    pj_bzero(&hwnd, sizeof(hwnd));
-    size_hint = QSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX);
-    destroy(true, false);
 }
 
@@ -56 +54 @@
 {
     switch(e->type()) {
+
     case QEvent::Resize:
-        {
-            // revert to default size hint, make it resizable
-            setFixedSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX);
-            // resize now
-            set_size();
-        }
-        break;
-    case QEvent::ParentAboutToChange:
+        set_size();
+        break;
+
+    case QEvent::ParentChange:
         get_size();
-        setFixedSize(size_hint);
-        break;
-    case QEvent::ParentChange:
-        {
-            get_size();
-            /*
+        if (0) {
             QRect qr = rect();
             if (qr.width() > size_hint.width())
@@ -77 +67 @@
             if (qr.height() > size_hint.height())
                 size_hint.setWidth(qr.height());
-            */
-            setFixedSize(size_hint);
-            attach();
         }
-        break;
+        setFixedSize(size_hint);
+        attach();
+        break;
+
+    case QEvent::Show:
+        show(true);
+        // revert to default size hint, make it resizable
+        setFixedSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX);
+        break;
+
+    case QEvent::Hide:
+        show(false);
+        break;
+
     default:
         break;
@@ -103 +103 @@
     orig_parent = GetParent(w);
 
+    SetWindowLong(w, GWL_STYLE, WS_CHILD);
     SetParent(w, new_parent);
-    SetWindowLong(w, GWL_STYLE, WS_CHILD);
-    ShowWindow(w, SW_SHOWNOACTIVATE);
     TRACE_("%p new parent handle = %p", w, new_parent);
 }
@@ -114 +113 @@
 
     HWND w = (HWND)hwnd.info.win.hwnd;
-    ShowWindow(w, SW_HIDE);
     SetParent(w, (HWND)orig_parent);
     TRACE_("%p revert parent handle to %p", w, orig_parent);
@@ -145 +143 @@
     if (!hwnd.info.win.hwnd) return;
 
-    ShowWindow(hwnd.info.win.hwnd, visible ? SW_SHOW : SW_HIDE);
+    HWND w = (HWND)hwnd.info.win.hwnd;
+    ShowWindow(w, visible ? SW_SHOW : SW_HIDE);
 }