Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make ScreenSaver preferences work again.

Browse Source 
This reverts 0fb019bbf21e791ae1f7644652fea3697b3f3d9f. Making the window
a BDirectWindow isn't a good idea, especially if you want things other
than a direct rendering view in it. Moreover, this is completely
unneeded as GL works just as well in non-direct mode.
This commit is contained in:
Adrien Destugues 2014-08-14 11:41:21 +02:00
parent 1333f5f77b
commit c8bd18f21f
2 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/preferences/screensaver/ScreenSaverWindow.cpp
View File

@ -887,7 +887,7 @@ TabView::MouseDown(BPoint where)
ScreenSaverWindow::ScreenSaverWindow() ScreenSaverWindow::ScreenSaverWindow()
: :
BDirectWindow(BRect(50, 50, 496, 375), BWindow(BRect(50, 50, 496, 375),
B_TRANSLATE_SYSTEM_NAME("ScreenSaver"), B_TITLED_WINDOW, B_TRANSLATE_SYSTEM_NAME("ScreenSaver"), B_TITLED_WINDOW,
B_ASYNCHRONOUS_CONTROLS | B_AUTO_UPDATE_SIZE_LIMITS) B_ASYNCHRONOUS_CONTROLS | B_AUTO_UPDATE_SIZE_LIMITS)
{ {
@ -958,15 +958,6 @@ ScreenSaverWindow::~ScreenSaverWindow()
} }
void
ScreenSaverWindow::DirectConnected(direct_buffer_info* info)
{
BScreenSaver* saver = fModulesView->ScreenSaver();
if (saver != NULL)
saver->DirectConnected(info);
}
void void
ScreenSaverWindow::MessageReceived(BMessage* message) ScreenSaverWindow::MessageReceived(BMessage* message)
{ {
@ -982,7 +973,7 @@ ScreenSaverWindow::MessageReceived(BMessage* message)
break; break;
default: default:
BDirectWindow::MessageReceived(message); BWindow::MessageReceived(message);
} }
} }

4
src/preferences/screensaver/ScreenSaverWindow.h
View File

@ -26,13 +26,11 @@ class ModulesView;
class TabView; class TabView;
class ScreenSaverWindow : public BDirectWindow { class ScreenSaverWindow : public BWindow {
public: public:
ScreenSaverWindow(); ScreenSaverWindow();
virtual ~ScreenSaverWindow(); virtual ~ScreenSaverWindow();
virtual void DirectConnected(direct_buffer_info* info);
virtual void MessageReceived(BMessage* message); virtual void MessageReceived(BMessage* message);
virtual void ScreenChanged(BRect frame, color_space space); virtual void ScreenChanged(BRect frame, color_space space);
virtual bool QuitRequested(); virtual bool QuitRequested();