[haiku-webkit-commits] r505 - webkit/trunk/WebKit/haiku/WebPositive

  • From: webkit@xxxxxxxxxxxxxxx
  • To: haiku-webkit-commits@xxxxxxxxxxxxx
  • Date: Wed, 19 May 2010 22:41:36 +0000

Author: stippi
Date: Wed May 19 22:41:36 2010
New Revision: 505
URL: http://mmlr.dyndns.org/changeset/505

Log:
Don't store the last window frame with the full-screen window size...

Modified:
   webkit/trunk/WebKit/haiku/WebPositive/BrowserApp.cpp
   webkit/trunk/WebKit/haiku/WebPositive/BrowserWindow.cpp
   webkit/trunk/WebKit/haiku/WebPositive/BrowserWindow.h

Modified: webkit/trunk/WebKit/haiku/WebPositive/BrowserApp.cpp
==============================================================================
--- webkit/trunk/WebKit/haiku/WebPositive/BrowserApp.cpp        Wed May 19 
22:23:51 2010        (r504)
+++ webkit/trunk/WebKit/haiku/WebPositive/BrowserApp.cpp        Wed May 19 
22:41:36 2010        (r505)
@@ -253,7 +253,7 @@
                if (!webWindow->Lock())
                        continue;
                if (webWindow->QuitRequested()) {
-                       fLastWindowFrame = webWindow->Frame();
+                       fLastWindowFrame = webWindow->WindowFrame();
                        webWindow->Quit();
                        i--;
                } else {

Modified: webkit/trunk/WebKit/haiku/WebPositive/BrowserWindow.cpp
==============================================================================
--- webkit/trunk/WebKit/haiku/WebPositive/BrowserWindow.cpp     Wed May 19 
22:23:51 2010        (r504)
+++ webkit/trunk/WebKit/haiku/WebPositive/BrowserWindow.cpp     Wed May 19 
22:41:36 2010        (r505)
@@ -846,7 +846,7 @@
                _ShutdownTab(0);
 
        BMessage message(WINDOW_CLOSED);
-       message.AddRect("window frame", Frame());
+       message.AddRect("window frame", WindowFrame());
        be_app->PostMessage(&message);
        return true;
 }
@@ -1018,6 +1018,16 @@
 }
 
 
+BRect
+BrowserWindow::WindowFrame() const
+{
+       if (fIsFullscreen)
+               return fNonFullscreenWindowFrame;
+       else
+               return Frame();
+}
+
+
 // #pragma mark - Notification API
 
 

Modified: webkit/trunk/WebKit/haiku/WebPositive/BrowserWindow.h
==============================================================================
--- webkit/trunk/WebKit/haiku/WebPositive/BrowserWindow.h       Wed May 19 
22:23:51 2010        (r504)
+++ webkit/trunk/WebKit/haiku/WebPositive/BrowserWindow.h       Wed May 19 
22:41:36 2010        (r505)
@@ -107,6 +107,8 @@
                        void                            CreateNewTab(const 
BString& url, bool select,
                                                                        
BWebView* webView = 0);
 
+                       BRect                           WindowFrame() const;
+
 private:
        // WebPage notification API implementations
        virtual void                            NavigationRequested(const 
BString& url,

Other related posts:

  • » [haiku-webkit-commits] r505 - webkit/trunk/WebKit/haiku/WebPositive - webkit