Changeset 3724 for pjproject/trunk/pjsip-apps/src/vidgui/vidwin.cpp
- Timestamp:
- Aug 25, 2011 11:59:39 AM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/trunk/pjsip-apps/src/vidgui/vidwin.cpp
r3715 r3724 141 141 } 142 142 143 void VidWin::show(bool visible) 144 { 145 if (!hwnd.info.win.hwnd) return; 146 147 ShowWindow(hwnd.info.win.hwnd, visible ? SW_SHOW : SW_HIDE); 148 } 149 143 150 #elif defined(__APPLE__) 144 151 … … 204 211 } 205 212 213 void VidWin::show(bool visible) 214 { 215 if (!hwnd.info.cocoa.window) return; 216 217 NSWindow *w = (NSWindow*)hwnd.info.cocoa.window; 218 219 if (visible) { 220 if (![w isMiniaturized]) { 221 [w makeKeyAndOrderFront:nil]; 222 } 223 } else { 224 [w orderOut:nil]; 225 } 226 } 206 227 207 228 #elif defined(linux) || defined(__linux) … … 212 233 #include <stdio.h> 213 234 235 #define GET_DISPLAY() QX11Info::display() 236 //#define GET_DISPLAY() (Display*)hwnd.info.x11.display 237 214 238 void VidWin::attach() 215 239 { … … 221 245 // the window failing to embed to this QWidget. 222 246 //Display *d = (Display*)hwnd.info.x11.display; 223 Display *d = QX11Info::display();247 Display *d = GET_DISPLAY(); 224 248 Window w = (Window)hwnd.info.x11.window; 225 249 Window parent = (Window)this->winId(); … … 240 264 241 265 /* Update position and size */ 242 Display *d = QX11Info::display();266 Display *d = GET_DISPLAY(); 243 267 Window w = (Window)hwnd.info.x11.window; 244 268 QRect qr = rect(); … … 253 277 if (!hwnd.info.x11.window) return; 254 278 255 Display *d = QX11Info::display();279 Display *d = GET_DISPLAY(); 256 280 Window w = (Window)hwnd.info.x11.window; 257 281 … … 262 286 } 263 287 288 void VidWin::show(bool visible) 289 { 290 if (!hwnd.info.x11.window) return; 291 292 Display *d = GET_DISPLAY(); 293 Window w = (Window)hwnd.info.x11.window; 294 295 if (visible) { 296 XMapRaised(d, w); 297 } else { 298 XUnmapWindow(d, w); 299 } 300 301 XFlush(d); 302 } 303 264 304 #endif 265 305
Note: See TracChangeset
for help on using the changeset viewer.