[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [61138] trunk/blender/source/blender/ windowmanager/intern/wm_window.c: OSX: forgot 1 file in last commit
jens verwiebe
info at jensverwiebe.de
Tue Nov 5 16:38:32 CET 2013
Revision: 61138
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=61138
Author: jensverwiebe
Date: 2013-11-05 15:38:31 +0000 (Tue, 05 Nov 2013)
Log Message:
-----------
OSX: forgot 1 file in last commit
Modified Paths:
--------------
trunk/blender/source/blender/windowmanager/intern/wm_window.c
Modified: trunk/blender/source/blender/windowmanager/intern/wm_window.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_window.c 2013-11-05 15:37:59 UTC (rev 61137)
+++ trunk/blender/source/blender/windowmanager/intern/wm_window.c 2013-11-05 15:38:31 UTC (rev 61138)
@@ -133,10 +133,6 @@
wm_get_screensize(&width, &height);
-#if defined(__APPLE__) && !defined(GHOST_COCOA)
- height -= 70;
-#endif
-
if (rect->xmin < 0) {
rect->xmax -= rect->xmin;
rect->xmin = 0;
@@ -338,12 +334,6 @@
* in case of OS application terminate request (e.g. OS Shortcut Alt+F4, Cmd+Q, (...), or session end) */
GHOST_SetWindowModifiedState(win->ghostwin, (GHOST_TUns8) !wm->file_saved);
-#if defined(__APPLE__) && !defined(GHOST_COCOA)
- if (wm->file_saved)
- GHOST_SetWindowState(win->ghostwin, GHOST_kWindowStateUnModified);
- else
- GHOST_SetWindowState(win->ghostwin, GHOST_kWindowStateModified);
-#endif
}
}
@@ -428,21 +418,13 @@
if (wm_init_state.size_x == 0) {
wm_get_screensize(&wm_init_state.size_x, &wm_init_state.size_y);
-#if defined(__APPLE__) && !defined(GHOST_COCOA)
- /* Cocoa provides functions to get correct max window size */
- {
- extern void wm_set_apple_prefsize(int, int); /* wm_apple.c */
-
- wm_set_apple_prefsize(wm_init_state.size_x, wm_init_state.size_y);
- }
-#else
- /* note!, this isnt quite correct, active screen maybe offset 1000s if PX,
- * we'd need a wm_get_screensize like function that gives offset,
- * in practice the window manager will likely move to the correct monitor */
- wm_init_state.start_x = 0;
- wm_init_state.start_y = 0;
-#endif
+ /* note!, this isnt quite correct, active screen maybe offset 1000s if PX,
+ * we'd need a wm_get_screensize like function that gives offset,
+ * in practice the window manager will likely move to the correct monitor */
+ wm_init_state.start_x = 0;
+ wm_init_state.start_y = 0;
+
#if !defined(__APPLE__) && !defined(WIN32) /* X11 */
/* X11, start maximized but use default sane size */
wm_init_state.size_x = min_ii(wm_init_state.size_x, WM_WIN_INIT_SIZE_X);
More information about the Bf-blender-cvs
mailing list