From 00d9a29e2e4e138b93b891fa277b05cbd2b2365c Mon Sep 17 00:00:00 2001
From: John Scipione <jscipione@gmail.com>
Date: Fri, 28 Feb 2014 16:43:09 -0500
Subject: [PATCH] ScreenSaver: Stop saver on General tab.

Unfortunately OpenGL screen saver previews draw on top of the tabview,
so, when you switch to the General tab we now stop the screen saver
and then restart it when you come back to the Screensavers tab.
---
 .../screensaver/ScreenSaverWindow.cpp         | 46 ++++++++++++++++++-
 .../screensaver/ScreenSaverWindow.h           |  4 +-
 2 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/src/preferences/screensaver/ScreenSaverWindow.cpp b/src/preferences/screensaver/ScreenSaverWindow.cpp
index fc3734a93b..5a552d36e3 100644
--- a/src/preferences/screensaver/ScreenSaverWindow.cpp
+++ b/src/preferences/screensaver/ScreenSaverWindow.cpp
@@ -98,6 +98,14 @@ private:
 };
 
 
+class TabView : public BTabView {
+public:
+								TabView();
+
+	virtual	void				MouseDown(BPoint where);
+};
+
+
 class FadeView : public BView {
 public:
 								FadeView(const char* name,
@@ -148,6 +156,8 @@ public:
 			BScreenSaver*		ScreenSaver();
 
 private:
+	friend class TabView;
+
 	static	int					_CompareScreenSaverItems(const void* left,
 									const void* right);
 
@@ -836,6 +846,40 @@ ModulesView::_OpenSaver()
 }
 
 
+//	#pragma mark - TabView
+
+
+TabView::TabView()
+	:
+	BTabView("tab_view", B_WIDTH_FROM_LABEL)
+{
+}
+
+
+void
+TabView::MouseDown(BPoint where)
+{
+	BTab* fadeTab = TabAt(0);
+	BRect fadeTabFrame(TabFrame(0));
+	BTab* modulesTab = TabAt(1);
+	BRect modulesTabFrame(TabFrame(1));
+	ModulesView* modulesView = dynamic_cast<ModulesView*>(modulesTab->View());
+
+	if (fadeTab != NULL && Selection() != 0 && fadeTabFrame.Contains(where)
+		&& modulesView != NULL) {
+		// clicked on the fade tab
+		modulesView->SaveState();
+		modulesView->_CloseSaver();
+	} else if (modulesTab != NULL && Selection() != 1
+		&& modulesTabFrame.Contains(where) && modulesView != NULL) {
+		// clicked on the modules tab
+		modulesView->MessageReceived(new BMessage(kMsgSaverSelected));
+	}
+
+	BTabView::MouseDown(where);
+}
+
+
 //	#pragma mark - ScreenSaverWindow
 
 
@@ -861,7 +905,7 @@ ScreenSaverWindow::ScreenSaverWindow()
 	fPasswordWindow->Run();
 
 	// Create the tab view
-	fTabView = new BTabView("tab_view", B_WIDTH_FROM_LABEL);
+	fTabView = new TabView();
 	fTabView->SetBorder(B_NO_BORDER);
 
 	// Create the controls inside the tabs
diff --git a/src/preferences/screensaver/ScreenSaverWindow.h b/src/preferences/screensaver/ScreenSaverWindow.h
index 3928394010..b9ddf45f77 100644
--- a/src/preferences/screensaver/ScreenSaverWindow.h
+++ b/src/preferences/screensaver/ScreenSaverWindow.h
@@ -20,10 +20,10 @@
 
 class BMessage;
 class BRect;
-class BTabView;
 
 class FadeView;
 class ModulesView;
+class TabView;
 
 
 class ScreenSaverWindow : public BDirectWindow {
@@ -47,7 +47,7 @@ private:
 
 			FadeView*			fFadeView;
 			ModulesView*		fModulesView;
-			BTabView*			fTabView;
+			TabView*			fTabView;
 };