I accidentally broke the build. Fixed now.
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@2096 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
b2c7cb6f60
commit
22eb56e099
@ -82,7 +82,7 @@ RefreshWindow::MessageReceived(BMessage* message)
|
||||
float Value = (float)fRefreshSlider->Value() / 10;
|
||||
|
||||
Message.AddFloat("refresh", Value);
|
||||
|
||||
|
||||
Messenger.SendMessage(&Message);
|
||||
|
||||
PostMessage(B_QUIT_REQUESTED);
|
||||
|
Binary file not shown.
@ -15,13 +15,13 @@ ScreenDrawView::ScreenDrawView(BRect rect, char *name)
|
||||
: BView(rect, name, B_FOLLOW_ALL, B_WILL_DRAW)
|
||||
{
|
||||
BScreen screen(B_MAIN_SCREEN_ID);
|
||||
if (!screen->IsValid())
|
||||
if (!screen.IsValid())
|
||||
; //Debugger() ?
|
||||
|
||||
desktopColor = screen->DesktopColor(current_workspace());
|
||||
desktopColor = screen.DesktopColor(current_workspace());
|
||||
|
||||
display_mode mode;
|
||||
screen->GetMode(&mode);
|
||||
screen.GetMode(&mode);
|
||||
|
||||
fResolution = mode.virtual_width;
|
||||
}
|
||||
@ -220,7 +220,7 @@ ScreenDrawView::MessageReceived(BMessage* message)
|
||||
if (!screen.IsValid())
|
||||
break;
|
||||
|
||||
desktopColor = screen->DesktopColor(current_workspace());
|
||||
desktopColor = screen.DesktopColor(current_workspace());
|
||||
|
||||
Invalidate();
|
||||
}
|
||||
|
@ -9,7 +9,6 @@
|
||||
#include <Screen.h>
|
||||
#include <Window.h>
|
||||
|
||||
|
||||
#include <math.h>
|
||||
#include <cstring>
|
||||
#include <cstdlib>
|
||||
@ -128,7 +127,7 @@ ScreenWindow::ScreenWindow(ScreenSettings *Settings)
|
||||
|
||||
fResolutionField = new BMenuField(ControlMenuRect, "ResolutionMenu", "Resolution:", fResolutionMenu, true);
|
||||
|
||||
Marked = fResolutionMenu->FindItem("640 x 480");
|
||||
Marked = fResolutionMenu->ItemAt(0);
|
||||
Marked->SetMarked(true);
|
||||
|
||||
fResolutionField->SetDivider(55.0);
|
||||
@ -251,6 +250,7 @@ ScreenWindow::ScreenWindow(ScreenSettings *Settings)
|
||||
|
||||
String << fInitialRefreshN;
|
||||
|
||||
int32 point = String.FindFirst(' ');
|
||||
String.Truncate(4);
|
||||
|
||||
String << " Hz/Other...";
|
||||
@ -415,7 +415,7 @@ ScreenWindow::MessageReceived(BMessage* message)
|
||||
|
||||
case BUTTON_DEFAULTS_MSG:
|
||||
{
|
||||
fResolutionMenu->FindItem("640 x 480")->SetMarked(true);
|
||||
fResolutionMenu->ItemAt(0)->SetMarked(true);
|
||||
fColorsMenu->FindItem("8 Bits/Pixel")->SetMarked(true);
|
||||
fRefreshMenu->FindItem("60 Hz")->SetMarked(true);
|
||||
|
||||
@ -572,7 +572,10 @@ ScreenWindow::MessageReceived(BMessage* message)
|
||||
|
||||
fRefreshMenu->Superitem()->SetLabel(String.String());
|
||||
}
|
||||
BScreen screen(B_MAIN_SCREEN_ID);
|
||||
BScreen screen(B_MAIN_SCREEN_ID);
|
||||
if (!screen.IsValid())
|
||||
break;
|
||||
|
||||
screen.SetMode(&fInitialMode);
|
||||
|
||||
break;
|
||||
@ -611,9 +614,11 @@ ScreenWindow::MessageReceived(BMessage* message)
|
||||
|
||||
case MAKE_INITIAL_MSG:
|
||||
{
|
||||
BScreen screen(B_MAIN_SCREEN_ID);
|
||||
display_mode mode;
|
||||
|
||||
BScreen screen(B_MAIN_SCREEN_ID);
|
||||
if (!screen.IsValid())
|
||||
break;
|
||||
|
||||
display_mode mode;
|
||||
screen.GetMode(&mode);
|
||||
|
||||
fInitialRefreshN = fCustomRefresh;
|
||||
|
Loading…
Reference in New Issue
Block a user