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

* Work-in-progress commit.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32023 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2009-07-31 15:16:11 +00:00
parent 249efd04b3
commit 8f30149c06
3 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/preferences/screen/ScreenMode.cpp
View File

@ -322,6 +322,26 @@ ScreenMode::GetRefreshLimits(const screen_mode& mode, float& min, float& max)
}
status_t
ScreenMode::GetMonitorInfo(monitor_info& info, float* _diagonalInches)
{
BScreen screen(fWindow);
status_t status = screen.GetMonitorInfo(&info);
if (status != B_OK)
return status;
if (_diagonalInches != NULL) {
*_diagonalInches = sqrt(info.width * info.width
+ info.height * info.height) / 2.54;
}
if (!strcmp(info.vendor, "LEN"))
strcpy(info.vendor, "Lenovo");
// TODO: replace more vendor strings with something readable
return B_OK;
}
screen_mode
ScreenMode::ModeAt(int32 index)
{

4
src/preferences/screen/ScreenMode.h
View File

@ -49,7 +49,9 @@ class ScreenMode {
void UpdateOriginalModes();
bool SupportsColorSpace(const screen_mode& mode, color_space space);
status_t GetRefreshLimits(const screen_mode& mode, float& min, float& max);
status_t GetRefreshLimits(const screen_mode& mode, float& min,
float& max);
status_t GetMonitorInfo(monitor_info& info, float* _diagonalInches);
screen_mode ModeAt(int32 index);
int32 CountModes();

5
src/preferences/screen/ScreenSettings.cpp
View File

@ -34,6 +34,11 @@ ScreenSettings::ScreenSettings()
file.Read(&fWindowFrame, sizeof(BRect));
// make sure the window is visible on screen
if (fWindowFrame.Width() > screenFrame.Width())
fWindowFrame.right = fWindowFrame.left + 450;
if (fWindowFrame.Height() > screenFrame.Height())
fWindowFrame.bottom = fWindowFrame.top + 250;
if (screenFrame.right >= fWindowFrame.left + 40
&& screenFrame.bottom >= fWindowFrame.top + 40
&& screenFrame.left <= fWindowFrame.right - 40