diff options
| author | callum <none@none> | 2011-11-01 10:57:34 -0700 |
|---|---|---|
| committer | callum <none@none> | 2011-11-01 10:57:34 -0700 |
| commit | 148e5f436dbb6f9126f1f6235e9056d4fb14ca66 (patch) | |
| tree | 0e4c056382e0e2d0752c6ed2ceee25f528c30b61 /indra/llwindow | |
| parent | 2777ddd0607caeeee16deae79ca8284bdaccd261 (diff) | |
| parent | d86def6f03acc3b4a07a30a2f7912e6dc35edf27 (diff) | |
merge with head
Diffstat (limited to 'indra/llwindow')
| -rw-r--r-- | indra/llwindow/llwindowmacosx.cpp | 4 | ||||
| -rw-r--r-- | indra/llwindow/llwindowwin32.cpp | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/indra/llwindow/llwindowmacosx.cpp b/indra/llwindow/llwindowmacosx.cpp index 4dd11541b9..8057506736 100644 --- a/indra/llwindow/llwindowmacosx.cpp +++ b/indra/llwindow/llwindowmacosx.cpp @@ -2545,8 +2545,8 @@ OSStatus LLWindowMacOSX::eventHandler (EventHandlerCallRef myHandler, EventRef e { // This is where we would constrain move/resize to a particular screen - const S32 MIN_WIDTH = 320; - const S32 MIN_HEIGHT = 240; + const S32 MIN_WIDTH = 1024; + const S32 MIN_HEIGHT = 768; Rect currentBounds; Rect previousBounds; diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp index 121c7880df..6ef49a9a9c 100644 --- a/indra/llwindow/llwindowwin32.cpp +++ b/indra/llwindow/llwindowwin32.cpp @@ -2354,6 +2354,14 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_ return 0; } + case WM_GETMINMAXINFO: + { + LPMINMAXINFO min_max = (LPMINMAXINFO)l_param; + min_max->ptMinTrackSize.x = 1024; + min_max->ptMinTrackSize.y = 768; + return 0; + } + case WM_SIZE: { window_imp->mCallbacks->handlePingWatchdog(window_imp, "Main:WM_SIZE"); |