From 42d707773dba9030b0d9324c993f586e33263683 Mon Sep 17 00:00:00 2001
From: Abdelrazak Younes <younes@lyx.org>
Date: Wed, 20 Feb 2008 14:27:52 +0000
Subject: [PATCH] Fullscreen support: Small cleanups. Still not sure why the
 scrollbar is not properly updated...

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23075 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/frontends/qt4/GuiView.cpp     | 16 +++++-----------
 src/frontends/qt4/GuiWorkArea.cpp |  9 ++++++++-
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index 456c3ffbed..0b6fb260c2 100644
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -1868,29 +1868,23 @@ void GuiView::lfunUiToggle(FuncRequest const & cmd)
 		d.toolbars_->toggleFullScreen(!isFullScreen());
 
 	if (isFullScreen()) {
-		showNormal();
+		for (int i = 0; i != d.splitter_->count(); ++i)
+			d.tabWorkArea(i)->setFullScreen(false);
 #if QT_VERSION >= 0x040300
 		setContentsMargins(0, 0, 0, 0);
 #endif
-		for (int i = 0; i != d.splitter_->count(); ++i)
-			d.tabWorkArea(i)->setFullScreen(false);
+		showNormal();
 		menuBar()->show();
 		statusBar()->show();
-		if (lyxrc.full_screen_scrollbar && d.current_work_area_)
-			d.current_work_area_->
-				setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
 	} else {
-		if (lyxrc.full_screen_scrollbar && d.current_work_area_)
-			d.current_work_area_->
-				setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-		statusBar()->hide();
-		menuBar()->hide();
 		for (int i = 0; i != d.splitter_->count(); ++i)
 			d.tabWorkArea(i)->setFullScreen(true);
 #if QT_VERSION >= 0x040300
 		setContentsMargins(-2, -2, -2, -2);
 #endif
 		showFullScreen();
+		statusBar()->hide();
+		menuBar()->hide();
 	}
 }
 
diff --git a/src/frontends/qt4/GuiWorkArea.cpp b/src/frontends/qt4/GuiWorkArea.cpp
index 0b2428f32e..42e1903dcf 100644
--- a/src/frontends/qt4/GuiWorkArea.cpp
+++ b/src/frontends/qt4/GuiWorkArea.cpp
@@ -259,8 +259,15 @@ void GuiWorkArea::close()
 
 void GuiWorkArea::setFullScreen(bool full_screen)
 {
-	setFrameStyle(QFrame::NoFrame);
 	buffer_view_->setFullScreen(full_screen);
+	if (full_screen) {
+		setFrameStyle(QFrame::NoFrame);
+		if (lyxrc.full_screen_scrollbar)
+			setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+	} else {
+		setFrameStyle(QFrame::Box);
+		setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
+	}
 }
 
 
-- 
2.39.5