From 823781426ff1e24083056d679211ee549a86e7af Mon Sep 17 00:00:00 2001 From: John Scipione Date: Sun, 23 Feb 2014 02:10:18 -0500 Subject: [PATCH] GLifeSaver: Show a preview Also, we are safe to enable direct mode now. --- .../screen_savers/glife/GLifeSaver.cpp | 24 +++++++------------ src/add-ons/screen_savers/glife/GLifeView.h | 5 ++-- 2 files changed, 11 insertions(+), 18 deletions(-) diff --git a/src/add-ons/screen_savers/glife/GLifeSaver.cpp b/src/add-ons/screen_savers/glife/GLifeSaver.cpp index 6b11f75d1c..fdb0b7ca25 100644 --- a/src/add-ons/screen_savers/glife/GLifeSaver.cpp +++ b/src/add-ons/screen_savers/glife/GLifeSaver.cpp @@ -73,21 +73,15 @@ GLifeSaver::StartConfig(BView* pbvView) status_t GLifeSaver::StartSaver(BView* pbvView, bool bPreview) { - if (bPreview) { - // We do not use the preview option - fGLifeViewport = 0; - return B_ERROR; - } else { - SetTickSize(c_iTickSize); - - fGLifeViewport = new GLifeView(pbvView->Bounds(), - "GLifeView", B_FOLLOW_NONE, BGL_RGB | BGL_DEPTH | BGL_DOUBLE, - &fGLifeState); + SetTickSize(c_iTickSize); - pbvView->AddChild(fGLifeViewport); - - return B_OK; - } + fGLifeViewport = new GLifeView(pbvView->Bounds(), + "GLifeView", B_FOLLOW_NONE, BGL_RGB | BGL_DEPTH | BGL_DOUBLE, + &fGLifeState); + + pbvView->AddChild(fGLifeViewport); + + return B_OK; } @@ -107,12 +101,10 @@ void GLifeSaver::DirectConnected(direct_buffer_info* pdbiInfo) { // Enable or disable direct rendering - #if 1 if (fGLifeViewport != NULL) { fGLifeViewport->DirectConnected(pdbiInfo); fGLifeViewport->EnableDirectMode(true); } - #endif } diff --git a/src/add-ons/screen_savers/glife/GLifeView.h b/src/add-ons/screen_savers/glife/GLifeView.h index 4fe1b22da0..2b249e3ee0 100644 --- a/src/add-ons/screen_savers/glife/GLifeView.h +++ b/src/add-ons/screen_savers/glife/GLifeView.h @@ -19,9 +19,10 @@ class GLifeView : public BGLView { public: // Constructor & Destructor - GLifeView(BRect, const char*, ulong, ulong, GLifeState*); + GLifeView(BRect, const char*, ulong, + ulong, GLifeState*); ~GLifeView(void); - + // Public Methods void AttachedToWindow(void); virtual void Draw(BRect updateRect);