Resolve two save/restore geometry issues on X11.

Reviewed-by: Brad

1: When restoring non-fullscreen geometry we would
offset the position if the window was currently
fullscreen. This seems wrong; the window geometry
is set correctly without the offset. 

2: QWidget::geometry() returns erroneous values
after restoring old full-screen geometry . The 
window itself is positioned correctly on screen. 
This is a very minor use case, let it silently 
fail.

1 files changed, 1 insertions, 6 deletions

diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp
index cd1c9f0..6bc699c 100644
--- a/src/gui/kernel/qwidget.cpp
+++ b/src/gui/kernel/qwidget.cpp
@@ -7066,13 +7066,8 @@ bool QWidget::restoreGeometry(const QByteArray &geometry)
        setWindowState(ws);
        d_func()->topData()->normalGeometry = restoredNormalGeometry;
     } else {
-        QPoint offset;
-#ifdef Q_WS_X11
-        if (isFullScreen())
-            offset = d_func()->topData()->fullScreenOffset;
-#endif
         setWindowState(windowState() & ~(Qt::WindowMaximized | Qt::WindowFullScreen));
-        move(restoredFrameGeometry.topLeft() + offset);
+        move(restoredFrameGeometry.topLeft());
         resize(restoredNormalGeometry.size());
     }
     return true;