i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

I accidentally broke the build. Fixed now.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@2096 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stefano Ceccherini
2002-11-27 14:41:16 +00:00
parent b2c7cb6f60
commit 22eb56e099
4 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/prefs/screen/Screen.rsrc
BIN
View File
Binary file not shown.
src/prefs/screen/ScreenDrawView.cpp
+4 -4
View File
@@ -15,13 +15,13 @@ ScreenDrawView::ScreenDrawView(BRect rect, char *name)
: BView(rect, name, B_FOLLOW_ALL, B_WILL_DRAW) : BView(rect, name, B_FOLLOW_ALL, B_WILL_DRAW)
{ {
BScreen screen(B_MAIN_SCREEN_ID); BScreen screen(B_MAIN_SCREEN_ID);
if (!screen->IsValid()) if (!screen.IsValid())
; //Debugger() ? ; //Debugger() ?
desktopColor = screen->DesktopColor(current_workspace()); desktopColor = screen.DesktopColor(current_workspace());
display_mode mode; display_mode mode;
screen->GetMode(&mode); screen.GetMode(&mode);
fResolution = mode.virtual_width; fResolution = mode.virtual_width;
} }
@@ -220,7 +220,7 @@ ScreenDrawView::MessageReceived(BMessage* message)
if (!screen.IsValid()) if (!screen.IsValid())
break; break;
desktopColor = screen->DesktopColor(current_workspace()); desktopColor = screen.DesktopColor(current_workspace());
Invalidate(); Invalidate();
} }
src/prefs/screen/ScreenWindow.cpp
+9 -4
View File
@@ -9,7 +9,6 @@
#include <Screen.h> #include <Screen.h>
#include <Window.h> #include <Window.h>
#include <math.h> #include <math.h>
#include <cstring> #include <cstring>
#include <cstdlib> #include <cstdlib>
@@ -128,7 +127,7 @@ ScreenWindow::ScreenWindow(ScreenSettings *Settings)
fResolutionField = new BMenuField(ControlMenuRect, "ResolutionMenu", "Resolution:", fResolutionMenu, true); fResolutionField = new BMenuField(ControlMenuRect, "ResolutionMenu", "Resolution:", fResolutionMenu, true);
Marked = fResolutionMenu->FindItem("640 x 480"); Marked = fResolutionMenu->ItemAt(0);
Marked->SetMarked(true); Marked->SetMarked(true);
fResolutionField->SetDivider(55.0); fResolutionField->SetDivider(55.0);
@@ -251,6 +250,7 @@ ScreenWindow::ScreenWindow(ScreenSettings *Settings)
String << fInitialRefreshN; String << fInitialRefreshN;
int32 point = String.FindFirst(' ');
String.Truncate(4); String.Truncate(4);
String << " Hz/Other..."; String << " Hz/Other...";
@@ -415,7 +415,7 @@ ScreenWindow::MessageReceived(BMessage* message)
case BUTTON_DEFAULTS_MSG: case BUTTON_DEFAULTS_MSG:
{ {
fResolutionMenu->FindItem("640 x 480")->SetMarked(true); fResolutionMenu->ItemAt(0)->SetMarked(true);
fColorsMenu->FindItem("8 Bits/Pixel")->SetMarked(true); fColorsMenu->FindItem("8 Bits/Pixel")->SetMarked(true);
fRefreshMenu->FindItem("60 Hz")->SetMarked(true); fRefreshMenu->FindItem("60 Hz")->SetMarked(true);
@@ -573,6 +573,9 @@ ScreenWindow::MessageReceived(BMessage* message)
fRefreshMenu->Superitem()->SetLabel(String.String()); fRefreshMenu->Superitem()->SetLabel(String.String());
} }
BScreen screen(B_MAIN_SCREEN_ID); BScreen screen(B_MAIN_SCREEN_ID);
if (!screen.IsValid())
break;
screen.SetMode(&fInitialMode); screen.SetMode(&fInitialMode);
break; break;
@@ -612,8 +615,10 @@ ScreenWindow::MessageReceived(BMessage* message)
case MAKE_INITIAL_MSG: case MAKE_INITIAL_MSG:
{ {
BScreen screen(B_MAIN_SCREEN_ID); BScreen screen(B_MAIN_SCREEN_ID);
display_mode mode; if (!screen.IsValid())
break;
display_mode mode;
screen.GetMode(&mode); screen.GetMode(&mode);
fInitialRefreshN = fCustomRefresh; fInitialRefreshN = fCustomRefresh;