diff options
author | Richard Linden <none@none> | 2012-02-23 12:40:27 -0800 |
---|---|---|
committer | Richard Linden <none@none> | 2012-02-23 12:40:27 -0800 |
commit | f4a122b6d72bdc2dc482fb04475703ffa5a00219 (patch) | |
tree | 0155d0d080b42740666564ed9f02b9d33069a4e5 /indra/llwindow/llwindowwin32.cpp | |
parent | a5e4b15b7d29a64781eb32ef71e557a5bb8dc870 (diff) | |
parent | 48bc2a7c9f6175a5c3179f6fccc98c3d3c50a4c9 (diff) |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience
Diffstat (limited to 'indra/llwindow/llwindowwin32.cpp')
-rw-r--r-- | indra/llwindow/llwindowwin32.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/llwindow/llwindowwin32.cpp b/indra/llwindow/llwindowwin32.cpp index bcf0857258..2910c3995a 100644 --- a/indra/llwindow/llwindowwin32.cpp +++ b/indra/llwindow/llwindowwin32.cpp @@ -876,6 +876,17 @@ BOOL LLWindowWin32::setSizeImpl(const LLCoordScreen size) return TRUE; } +BOOL LLWindowWin32::setSizeImpl(const LLCoordWindow size) +{ + RECT window_rect = {0, 0, size.mX, size.mY }; + DWORD dw_ex_style = WS_EX_APPWINDOW | WS_EX_WINDOWEDGE; + DWORD dw_style = WS_OVERLAPPEDWINDOW; + + AdjustWindowRectEx(&window_rect, dw_style, FALSE, dw_ex_style); + + return setSizeImpl(LLCoordScreen(window_rect.right - window_rect.left, window_rect.bottom - window_rect.top)); +} + // changing fullscreen resolution BOOL LLWindowWin32::switchContext(BOOL fullscreen, const LLCoordScreen &size, BOOL disable_vsync, const LLCoordScreen * const posp) { |