livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Backed out changeset a95c1f4dcf02 EXT-4820([NUX] Viewer dimensions on first-run) 

by which "implemented LLWindowMacOSX::maximize() method"

--HG--
branch : product-engine
master
Igor Borovkov 2010-03-18 16:28:54 +02:00
parent 870dcca787
commit 9229f09928
3 changed files with 2 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llwindow/llwindowmacosx-objc.h
View File

@ -41,4 +41,4 @@ CursorRef createImageCursor(const char *fullpath, int hotspotX, int hotspotY);
OSErr releaseImageCursor(CursorRef ref);
OSErr setImageCursor(CursorRef ref);
void getScreenSize(int* width, int* height);
void getVisibleScreen(int *x, int *y, int* width, int* height);

10
indra/llwindow/llwindowmacosx-objc.mm
View File

@ -125,13 +125,3 @@ void getScreenSize(int* width, int* height)
[pool release];
}
void getVisibleScreen(int *x, int *y, int* width, int* height)
{
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
NSRect visible_rect = [[NSScreen mainScreen] visibleFrame];
if (width) *width = (int)(visible_rect.size.width);
if (height) *height = (int)(visible_rect.size.height);
if (x) *x = (int)(visible_rect.origin.x);
if (y) *y = (int)(visible_rect.origin.y);
[pool release];
}

28
indra/llwindow/llwindowmacosx.cpp
View File

@ -1122,33 +1122,7 @@ BOOL LLWindowMacOSX::getMaximized()
BOOL LLWindowMacOSX::maximize()
{
if (mWindow)
{
// *HACK: Because Mac OSX doesn't have a concept of a "maximized" window, we just
// stretch it out to the visible screen size.
Rect win_rect;
int visible_x;
int visible_y;
int visible_width;
int visible_height;
int screen_width;
int screen_height;
getScreenSize(&screen_width, &screen_height);
getVisibleScreen(&visible_x, &visible_y, &visible_width, &visible_height);
int mac_os_menu_bar_height = screen_height - (visible_height + visible_y);
::SetRect(&win_rect,
visible_x,
mac_os_menu_bar_height,
visible_width + visible_x,
visible_height + mac_os_menu_bar_height);
::SetWindowBounds(mWindow, kWindowStructureRgn, &win_rect);
return TRUE;
}
// TODO
return FALSE;
}