fixes to ShowFullScreen (KDE 3.1)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19096 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/toplevel.cpp b/src/gtk/toplevel.cpp
index d77ae76a911b0b7a692dcff0a01f37bd3533f3c9..1e76307895e2dd2c2b7374f1804915af721d077f 100644 (file)
--- a/src/gtk/toplevel.cpp
+++ b/src/gtk/toplevel.cpp
@@ -524,7 +524,7 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style )
                gint client_x, client_y, root_x, root_y;
                gint width, height;
 
                gint client_x, client_y, root_x, root_y;
                gint width, height;
 

-        if (method == wxX11_FS_GENERIC)
+        if (method != wxX11_FS_WMSPEC)

         {
             // don't do it always, Metacity hates it
             m_fsSaveGdkFunc = m_gdkFunc;
         {
             // don't do it always, Metacity hates it
             m_fsSaveGdkFunc = m_gdkFunc;


@@ -548,7 +548,7 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style )
     }
     else
     {
     }
     else
     {

-        if (method == wxX11_FS_GENERIC)
+        if (method != wxX11_FS_WMSPEC)

         {
             // don't do it always, Metacity hates it
             m_gdkFunc = m_fsSaveGdkFunc;
         {
             // don't do it always, Metacity hates it
             m_gdkFunc = m_fsSaveGdkFunc;

diff --git a/src/gtk1/toplevel.cpp b/src/gtk1/toplevel.cpp
index d77ae76a911b0b7a692dcff0a01f37bd3533f3c9..1e76307895e2dd2c2b7374f1804915af721d077f 100644 (file)
--- a/src/gtk1/toplevel.cpp
+++ b/src/gtk1/toplevel.cpp
@@ -524,7 +524,7 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style )
                gint client_x, client_y, root_x, root_y;
                gint width, height;
 
                gint client_x, client_y, root_x, root_y;
                gint width, height;
 

-        if (method == wxX11_FS_GENERIC)
+        if (method != wxX11_FS_WMSPEC)

         {
             // don't do it always, Metacity hates it
             m_fsSaveGdkFunc = m_gdkFunc;
         {
             // don't do it always, Metacity hates it
             m_fsSaveGdkFunc = m_gdkFunc;


@@ -548,7 +548,7 @@ bool wxTopLevelWindowGTK::ShowFullScreen(bool show, long style )
     }
     else
     {
     }
     else
     {

-        if (method == wxX11_FS_GENERIC)
+        if (method != wxX11_FS_WMSPEC)

         {
             // don't do it always, Metacity hates it
             m_gdkFunc = m_fsSaveGdkFunc;
         {
             // don't do it always, Metacity hates it
             m_gdkFunc = m_fsSaveGdkFunc;

diff --git a/src/unix/utilsx11.cpp b/src/unix/utilsx11.cpp
index 8f3eb5dc7d2c57c45ff860b7e22926aa36e2ca3f..d2145aaa37bd6d3a6da7c0ef875e8c5ecdbadfb2 100644 (file)
--- a/src/unix/utilsx11.cpp
+++ b/src/unix/utilsx11.cpp
@@ -400,17 +400,29 @@ static void wxSetKDEFullscreen(Display *display, Window rootWnd,
     }
 
     // it is neccessary to unmap the window, otherwise kwin will ignore us:
     }
 
     // it is neccessary to unmap the window, otherwise kwin will ignore us:

+    XSync(display, False);
+    

     bool wasMapped = IsMapped(display, w);
     if (wasMapped)
     bool wasMapped = IsMapped(display, w);
     if (wasMapped)

+    {

         XUnmapWindow(display, w);
         XUnmapWindow(display, w);

+        XSync(display, False);
+    }
+

     XChangeProperty(display, w, _NET_WM_WINDOW_TYPE, XA_ATOM, 32,
                        PropModeReplace, (unsigned char *) &data, lng);
     XChangeProperty(display, w, _NET_WM_WINDOW_TYPE, XA_ATOM, 32,
                        PropModeReplace, (unsigned char *) &data, lng);

+    XSync(display, False);
+

     if (wasMapped)
     if (wasMapped)

+    {

         XMapRaised(display, w);
         XMapRaised(display, w);

+        XSync(display, False);
+    }

     
     wxWMspecSetState(display, rootWnd, w, 
                      fullscreen ? _NET_WM_STATE_ADD : _NET_WM_STATE_REMOVE,
                      _NET_WM_STATE_STAYS_ON_TOP);
     
     wxWMspecSetState(display, rootWnd, w, 
                      fullscreen ? _NET_WM_STATE_ADD : _NET_WM_STATE_REMOVE,
                      _NET_WM_STATE_STAYS_ON_TOP);

+    XSync(display, False);

 
     if (!fullscreen)
     {
 
     if (!fullscreen)
     {


@@ -423,6 +435,7 @@ static void wxSetKDEFullscreen(Display *display, Window rootWnd,
         XMoveResizeWindow(display, w,
                           origRect->x, origRect->y,
                           origRect->width, origRect->height);
         XMoveResizeWindow(display, w,
                           origRect->x, origRect->y,
                           origRect->width, origRect->height);

+        XSync(display, False);

     }
 }
 
     }
 }