From e34ad6ade07e82732bcab9c8774544bd08ee13f5 Mon Sep 17 00:00:00 2001
From: Abdelrazak Younes <younes@lyx.org>
Date: Sat, 11 Nov 2006 17:41:55 +0000
Subject: [PATCH] - Cleanup splash screen - fix bug when no Buffer. - hide
 scrollbar when no buffer

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15862 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/frontends/WorkArea.C        | 23 ++++-------------------
 src/frontends/WorkArea.h        |  4 ----
 src/frontends/qt4/GuiWorkArea.C | 18 +++++-------------
 3 files changed, 9 insertions(+), 36 deletions(-)

diff --git a/src/frontends/WorkArea.C b/src/frontends/WorkArea.C
index 2d6663cf4d..17cac2a849 100644
--- a/src/frontends/WorkArea.C
+++ b/src/frontends/WorkArea.C
@@ -129,20 +129,12 @@ void WorkArea::startBlinkingCursor()
 }
 
 
-void WorkArea::checkAndGreyOut()
-{
-	if (greyed_out_)
-		greyOut();
-}
-
-
 void WorkArea::redraw(bool singlePar)
 {
-	if (!buffer_view_)
-		return;
-
-	if (!buffer_view_->buffer()) {
-		checkAndGreyOut();
+	if (!buffer_view_ || !buffer_view_->buffer()) {
+		greyed_out_ = true;
+		// The argument here are meaningless.
+		expose(1,1,1,1);
 		return;
 	}
 
@@ -257,13 +249,6 @@ void WorkArea::scrollBufferView(int position)
 }
 
 
-void WorkArea::greyOut()
-{
-	greyed_out_ = true;
-	expose(4, 5, 3, 3);
-}
-
-
 void WorkArea::showCursor()
 {
 	if (cursor_visible_)
diff --git a/src/frontends/WorkArea.h b/src/frontends/WorkArea.h
index 90638d5c92..0db53ceaab 100644
--- a/src/frontends/WorkArea.h
+++ b/src/frontends/WorkArea.h
@@ -85,14 +85,10 @@ public:
 	/// redraw the screen, without using existing pixmap
 	virtual void redraw(bool singlePar = false);
 	///
-	void checkAndGreyOut();
-	///
 	void stopBlinkingCursor();
 	void startBlinkingCursor();
 
 protected:
-	/// grey out (no buffer)
-	virtual void greyOut();
 	///
 	void processKeySym(LyXKeySymPtr key, key_modifier::state state);
 	/// cause the display of the given area of the work area
diff --git a/src/frontends/qt4/GuiWorkArea.C b/src/frontends/qt4/GuiWorkArea.C
index b64c9456a6..24a9a0d096 100644
--- a/src/frontends/qt4/GuiWorkArea.C
+++ b/src/frontends/qt4/GuiWorkArea.C
@@ -545,7 +545,6 @@ void GuiWorkArea::update(int x, int y, int w, int h)
 
 void GuiWorkArea::doGreyOut(QLPainter & pain)
 {
-	greyed_out_ = true;
 	pain.fillRectangle(0, 0, width(), height(),
 		LColor::bottomarea);
 
@@ -600,26 +599,19 @@ void GuiWorkArea::paintEvent(QPaintEvent * ev)
 }
 
 
-
 void GuiWorkArea::expose(int x, int y, int w, int h)
 {
 	QLPainter pain(&screen_);
 
-	if (w == 3) { // FIXME HACK
-		// Assume splash screen drawing is requested when
-		// width == 3
+	if (greyed_out_) {
 		lyxerr << "splash screen requested" << endl;
+		verticalScrollBar()->hide();
 		doGreyOut(pain);
-	}
-	else if (!buffer_view_->buffer()) {
-		lyxerr << "no buffer: " << endl;
-		doGreyOut(pain);
-		updateScrollbar();
-	}
-	else {
-		paintText(*buffer_view_, pain);
+		update(0, 0, width(), height());
+		return;
 	}
 
+	paintText(*buffer_view_, pain);
 	update(x, y, w, h);
 }
 
-- 
2.39.2