[Gnash-commit] /srv/bzr/gnash/trunk r10607: Allow Kde4gui plugin to properly re-embed when exiting fullscreen mode

[John Wimer]

------------------------------------------------------------
revno: 10607
committer: John Wimer <address@hidden>
branch nick: trunk
timestamp: Sun 2009-02-22 16:47:03 +0100
message:
  Allow Kde4gui plugin to properly re-embed when exiting fullscreen mode
modified:
  gui/Kde4Gui.cpp

=== modified file 'gui/Kde4Gui.cpp'
--- a/gui/Kde4Gui.cpp   2009-02-22 11:28:14 +0000
+++ b/gui/Kde4Gui.cpp   2009-02-22 15:47:03 +0000
@@ -287,9 +287,9 @@
     _fullscreen = true;
     fullscreenAction->setChecked(_fullscreen);
 
-    _window->showFullScreen();
-    QMenuBar* mainMenu = _window->menuBar();
-    if (mainMenu) mainMenu->hide();
+    // Make the widget a top level window so it can be fullscreen
+    _drawingWidget->setWindowFlags(Qt::Window);
+    _drawingWidget->showFullScreen();
 }
 
 void
@@ -298,9 +298,15 @@
     _fullscreen = false;
     fullscreenAction->setChecked(_fullscreen);
 
-    _window->showNormal();
-    QMenuBar* mainMenu = _window->menuBar();
-    if (mainMenu) mainMenu->show();
+    // Re-embed the drawing wiget into the browser
+    if (_xid) {
+        _drawingWidget->embedInto(_xid);
+    }
+    else {
+        _drawingWidget->setWindowFlags(Qt::Widget);
+    }
+
+    _drawingWidget->showNormal();
 }
 
 gnash::key::code