From 310a9c9e21c4d5a60afe67a8e14f4db274dfc02a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Sun, 19 Oct 2008 13:15:58 +0000 Subject: [PATCH] * Setting to the saver full screen and back is no longer needed when the password window shows up (this avoids getting the Deskbar to front when the password window shows up). * Automatic whitespace cleanup. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@28238 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/bin/screen_blanker/ScreenBlanker.cpp | 25 +++++++++++------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/src/bin/screen_blanker/ScreenBlanker.cpp b/src/bin/screen_blanker/ScreenBlanker.cpp index 895a632873..af8acb8389 100644 --- a/src/bin/screen_blanker/ScreenBlanker.cpp +++ b/src/bin/screen_blanker/ScreenBlanker.cpp @@ -55,7 +55,7 @@ ScreenBlanker::~ScreenBlanker() void -ScreenBlanker::ReadyToRun() +ScreenBlanker::ReadyToRun() { if (!fSettings.Load()) { fprintf(stderr, "could not load settings\n"); @@ -113,19 +113,18 @@ ScreenBlanker::_SetDPMSMode(uint32 mode) void -ScreenBlanker::_ShowPasswordWindow() +ScreenBlanker::_ShowPasswordWindow() { _TurnOnScreen(); if (fWindow->Lock()) { fRunner->Suspend(); - if (fWindow->SetFullScreen(false) == B_OK) { - fWindow->Sync(); - // TODO: is that needed? - ShowCursor(); - fPasswordWindow->Show(); - } + fWindow->Sync(); + // TODO: is that needed? + ShowCursor(); + fPasswordWindow->Show(); + fWindow->Unlock(); } @@ -228,10 +227,8 @@ ScreenBlanker::MessageReceived(BMessage* message) case kMsgResumeSaver: if (fWindow->Lock()) { - if (fWindow->SetFullScreen(true) == B_OK) { - HideCursor(); - fPasswordWindow->Hide(); - } + HideCursor(); + fPasswordWindow->Hide(); fRunner->Resume(); fWindow->Unlock(); @@ -272,7 +269,7 @@ ScreenBlanker::QuitRequested() void -ScreenBlanker::_Shutdown() +ScreenBlanker::_Shutdown() { delete fRunner; @@ -289,7 +286,7 @@ ScreenBlanker::_Shutdown() int -main(int, char**) +main(int, char**) { ScreenBlanker app; app.Run();