[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54084] trunk/blender/intern/ghost/intern: Put back minimum window sizes on 320x240.

Ton Roosendaal ton at blender.org
Thu Jan 24 18:57:40 CET 2013


Revision: 54084
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54084
Author:   ton
Date:     2013-01-24 17:57:38 +0000 (Thu, 24 Jan 2013)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp
    trunk/blender/intern/ghost/intern/GHOST_WindowCocoa.mm
    trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp

Modified: trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp	2013-01-24 17:21:22 UTC (rev 54083)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp	2013-01-24 17:57:38 UTC (rev 54084)
@@ -783,8 +783,8 @@
 
 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

Modified: trunk/blender/intern/ghost/intern/GHOST_WindowCocoa.mm
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_WindowCocoa.mm	2013-01-24 17:21:22 UTC (rev 54083)
+++ trunk/blender/intern/ghost/intern/GHOST_WindowCocoa.mm	2013-01-24 17:57:38 UTC (rev 54084)
@@ -488,8 +488,8 @@
 	[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 @@
 				[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];

Modified: trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp	2013-01-24 17:21:22 UTC (rev 54083)
+++ trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp	2013-01-24 17:57:38 UTC (rev 54084)
@@ -358,8 +358,8 @@
 	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);




More information about the Bf-blender-cvs mailing list