From f94d5e280024f8c54675efb36373b9357156eb41 Mon Sep 17 00:00:00 2001
From: stippi <stippi@94f232f2-1747-11df-bad5-a5bfde151594>
Date: Wed, 19 May 2010 22:41:36 +0000
Subject: [PATCH] Don't store the last window frame with the full-screen window
 size...

git-svn-id: http://svn.haiku-os.org/webpositive/webkit/trunk@505 94f232f2-1747-11df-bad5-a5bfde151594
---
 src/apps/webpositive/BrowserApp.cpp    |  2 +-
 src/apps/webpositive/BrowserWindow.cpp | 12 +++++++++++-
 src/apps/webpositive/BrowserWindow.h   |  2 ++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/apps/webpositive/BrowserApp.cpp b/src/apps/webpositive/BrowserApp.cpp
index b6f1cc349e..3e936e273f 100644
--- a/src/apps/webpositive/BrowserApp.cpp
+++ b/src/apps/webpositive/BrowserApp.cpp
@@ -253,7 +253,7 @@ BrowserApp::QuitRequested()
 		if (!webWindow->Lock())
 			continue;
 		if (webWindow->QuitRequested()) {
-			fLastWindowFrame = webWindow->Frame();
+			fLastWindowFrame = webWindow->WindowFrame();
 			webWindow->Quit();
 			i--;
 		} else {
diff --git a/src/apps/webpositive/BrowserWindow.cpp b/src/apps/webpositive/BrowserWindow.cpp
index 9888677abf..b3e88a54de 100644
--- a/src/apps/webpositive/BrowserWindow.cpp
+++ b/src/apps/webpositive/BrowserWindow.cpp
@@ -846,7 +846,7 @@ BrowserWindow::QuitRequested()
 		_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 @@ BrowserWindow::CreateNewTab(const BString& _url, bool select, BWebView* webView)
 }
 
 
+BRect
+BrowserWindow::WindowFrame() const
+{
+	if (fIsFullscreen)
+		return fNonFullscreenWindowFrame;
+	else
+		return Frame();
+}
+
+
 // #pragma mark - Notification API
 
 
diff --git a/src/apps/webpositive/BrowserWindow.h b/src/apps/webpositive/BrowserWindow.h
index 4fd972fcce..adbe3742a2 100644
--- a/src/apps/webpositive/BrowserWindow.h
+++ b/src/apps/webpositive/BrowserWindow.h
@@ -107,6 +107,8 @@ public:
 			void				CreateNewTab(const BString& url, bool select,
 									BWebView* webView = 0);
 
+			BRect				WindowFrame() const;
+
 private:
 	// WebPage notification API implementations
 	virtual	void				NavigationRequested(const BString& url,