From 9229f09928a6604e7e1646be582e8322fdcca4e9 Mon Sep 17 00:00:00 2001 From: Igor Borovkov Date: Thu, 18 Mar 2010 16:28:54 +0200 Subject: Backed out changeset a95c1f4dcf02 EXT-4820([NUX] Viewer dimensions on first-run) by which "implemented LLWindowMacOSX::maximize() method" --HG-- branch : product-engine --- indra/llwindow/llwindowmacosx.cpp | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) (limited to 'indra/llwindow/llwindowmacosx.cpp') diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp index 924acaf148..5b21e06fe2 100644 --- a/indra/llwindow/llwindowmacosx.cpp +++ b/indra/llwindow/llwindowmacosx.cpp @@ -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; } -- cgit v1.2.3 From c67bc96278ea76372d896fb82fc6f3557feac446 Mon Sep 17 00:00:00 2001 From: Igor Borovkov Date: Thu, 18 Mar 2010 16:31:09 +0200 Subject: Backed out changeset f4c0761897c6 EXT-4820([NUX] Viewer dimensions on first-run) by which "moved LLDisplayInfo to llwindow, implemented getting the width/height of screen for mac os and linux." --HG-- branch : product-engine --- indra/llwindow/llwindowmacosx.cpp | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'indra/llwindow/llwindowmacosx.cpp') diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp index 5b21e06fe2..ad97bc45fc 100644 --- a/indra/llwindow/llwindowmacosx.cpp +++ b/indra/llwindow/llwindowmacosx.cpp @@ -3464,26 +3464,6 @@ MASK LLWindowMacOSX::modifiersToMask(SInt16 modifiers) return mask; } -// static -S32 LLWindowMacOSX::getDisplayWidth() -{ - S32 width = 1024; - // Need to invoke cocoa before use getScreenSize() - setupCocoa(); - getScreenSize(&width, NULL); - return width; -} - -// static -S32 LLWindowMacOSX::getDisplayHeight() -{ - S32 height = 768; - // Need to invoke cocoa before use getScreenSize() - setupCocoa(); - getScreenSize(NULL, &height); - return height; -} - #if LL_OS_DRAGDROP_ENABLED OSErr LLWindowMacOSX::dragTrackingHandler(DragTrackingMessage message, WindowRef theWindow, -- cgit v1.2.3