diff options
| author | Ton Roosendaal <ton@blender.org> | 2013-01-24 21:57:38 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2013-01-24 21:57:38 +0400 |
| commit | 4477d59b76a0785f24cce263a3496c27ad002532 (patch) | |
| tree | a8106496e157fb2a10b8ca54a792d34da7c1c3ea | |
| parent | da4028d4a8265b7d4ba608729127604ea0f87a21 (diff) | |
Put back minimum window sizes on 320x240.
This didnt work well with making blender areas into windows.
Real fix: check such minimums based on what's in the window itself... or just
make scaling work flawless.
| -rw-r--r-- | intern/ghost/intern/GHOST_SystemWin32.cpp | 4 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_WindowCocoa.mm | 6 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_WindowX11.cpp | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp index 75d606a5d79..50d7b372dd6 100644 --- a/intern/ghost/intern/GHOST_SystemWin32.cpp +++ b/intern/ghost/intern/GHOST_SystemWin32.cpp @@ -783,8 +783,8 @@ GHOST_TSuccess GHOST_SystemWin32::pushDragDropEvent(GHOST_TEventType eventType, void GHOST_SystemWin32::processMinMaxInfo(MINMAXINFO *minmax) { - minmax->ptMinTrackSize.x = 640; - minmax->ptMinTrackSize.y = 480; + minmax->ptMinTrackSize.x = 320; + minmax->ptMinTrackSize.y = 240; } #ifdef WITH_INPUT_NDOF diff --git a/intern/ghost/intern/GHOST_WindowCocoa.mm b/intern/ghost/intern/GHOST_WindowCocoa.mm index 0ce04c50e81..ccd6cd93d4c 100644 --- a/intern/ghost/intern/GHOST_WindowCocoa.mm +++ b/intern/ghost/intern/GHOST_WindowCocoa.mm @@ -488,8 +488,8 @@ GHOST_WindowCocoa::GHOST_WindowCocoa( [m_window setSystemAndWindowCocoa:systemCocoa windowCocoa:this]; //Forbid to resize the window below the blender defined minimum one - minSize.width = 640; - minSize.height = 480; + minSize.width = 320; + minSize.height = 240; [m_window setContentMinSize:minSize]; setTitle(title); @@ -1049,7 +1049,7 @@ GHOST_TSuccess GHOST_WindowCocoa::setState(GHOST_TWindowState state) [tmpWindow registerForDraggedTypes:[NSArray arrayWithObjects:NSFilenamesPboardType, NSStringPboardType, NSTIFFPboardType, nil]]; //Forbid to resize the window below the blender defined minimum one - [tmpWindow setContentMinSize:NSMakeSize(640, 480)]; + [tmpWindow setContentMinSize:NSMakeSize(320, 240)]; //Assign the openGL view to the new window [tmpWindow setContentView:m_openGLView]; diff --git a/intern/ghost/intern/GHOST_WindowX11.cpp b/intern/ghost/intern/GHOST_WindowX11.cpp index ce3d9cc46f8..2e9ac94b9c7 100644 --- a/intern/ghost/intern/GHOST_WindowX11.cpp +++ b/intern/ghost/intern/GHOST_WindowX11.cpp @@ -358,8 +358,8 @@ GHOST_WindowX11( xsizehints->y = top; xsizehints->width = width; xsizehints->height = height; - xsizehints->min_width = 640; /* size hints, could be made apart of the ghost api */ - xsizehints->min_height = 480; /* limits are also arbitrary, but should not allow 1x1 window */ + xsizehints->min_width = 320; /* size hints, could be made apart of the ghost api */ + xsizehints->min_height = 240; /* limits are also arbitrary, but should not allow 1x1 window */ xsizehints->max_width = 65535; xsizehints->max_height = 65535; XSetWMNormalHints(m_display, m_window, xsizehints); |