diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-10-06 18:32:53 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-10-06 18:32:53 +0400 |
| commit | 03bb0f5c7214889674ee0662e426608bc6b2acd6 (patch) | |
| tree | 226454489854b3bcc71c54c9cfb7ae341fb78e39 /source/blender/windowmanager | |
| parent | 31db661e1dfeed299f194c7d3fe39a84d28e38e2 (diff) | |
Revert revision 59985, 59986, 60046 and 60067. These were fixes to improve save
and restore of window setups with multiple monitors, but they are also causing
regressions, in particular issues with Blender overlapping the taskbar and the
user preferences opening wrong. We decided to revert to the old behavior for
the release.
See bug #36707 for the full explanation.
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_window.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c index 84ffd7ae3a5..9e89c17e024 100644 --- a/source/blender/windowmanager/intern/wm_window.c +++ b/source/blender/windowmanager/intern/wm_window.c @@ -131,7 +131,7 @@ static void wm_window_check_position(rcti *rect) { int width, height, d; - wm_get_desktopsize(&width, &height); + wm_get_screensize(&width, &height); #if defined(__APPLE__) && !defined(GHOST_COCOA) height -= 70; @@ -359,7 +359,7 @@ static void wm_window_add_ghostwindow(const char *title, wmWindow *win) if (multisamples == -1) multisamples = U.ogl_multisamples; - wm_get_desktopsize(&scr_w, &scr_h); + wm_get_screensize(&scr_w, &scr_h); posy = (scr_h - win->posy - win->sizey); ghostwin = GHOST_CreateWindow(g_system, title, |