[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13066] branches/blender2.5/blender: * also distinguish between maximised and fullscreen on GHOST win32.
Nathan Letwory
jesterking at letwory.net
Mon Dec 31 00:09:34 CET 2007
Revision: 13066
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13066
Author: jesterking
Date: 2007-12-31 00:09:33 +0100 (Mon, 31 Dec 2007)
Log Message:
-----------
* also distinguish between maximised and fullscreen on GHOST win32.
* clean up some warnings (unused vars).
Modified Paths:
--------------
branches/blender2.5/blender/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/blender2.5/blender/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_window.c
Modified: branches/blender2.5/blender/intern/ghost/intern/GHOST_SystemWin32.cpp
===================================================================
--- branches/blender2.5/blender/intern/ghost/intern/GHOST_SystemWin32.cpp 2007-12-30 22:52:00 UTC (rev 13065)
+++ branches/blender2.5/blender/intern/ghost/intern/GHOST_SystemWin32.cpp 2007-12-30 23:09:33 UTC (rev 13066)
@@ -225,7 +225,7 @@
GHOST_TSuccess GHOST_SystemWin32::getCursorPosition(GHOST_TInt32& x, GHOST_TInt32& y) const
{
POINT point;
- bool success = ::GetCursorPos(&point) == TRUE;
+ ::GetCursorPos(&point);
x = point.x;
y = point.y;
return GHOST_kSuccess;
Modified: branches/blender2.5/blender/intern/ghost/intern/GHOST_WindowWin32.cpp
===================================================================
--- branches/blender2.5/blender/intern/ghost/intern/GHOST_WindowWin32.cpp 2007-12-30 22:52:00 UTC (rev 13065)
+++ branches/blender2.5/blender/intern/ghost/intern/GHOST_WindowWin32.cpp 2007-12-30 23:09:33 UTC (rev 13066)
@@ -145,7 +145,7 @@
}
if (m_hWnd) {
// Store a pointer to this class in the window structure
- LONG result = ::SetWindowLongPtr(m_hWnd, GWL_USERDATA, (LONG)this);
+ ::SetWindowLongPtr(m_hWnd, GWL_USERDATA, (LONG_PTR)this);
// Store the device context
m_hDC = ::GetDC(m_hWnd);
@@ -373,7 +373,11 @@
state = GHOST_kWindowStateMinimized;
}
else if (::IsZoomed(m_hWnd)) {
- state = GHOST_kWindowStateMaximized;
+ LONG_PTR result = ::GetWindowLongPtr(m_hWnd, GWL_STYLE);
+ if((result & (WS_POPUP | WS_MAXIMIZE)) != (WS_POPUP | WS_MAXIMIZE))
+ state = GHOST_kWindowStateMaximized;
+ else
+ state = GHOST_kWindowStateFullScreen;
}
else {
state = GHOST_kWindowStateNormal;
@@ -622,7 +626,7 @@
}
if (success) {
- HCURSOR hCursor = ::SetCursor(::LoadCursor(0, id));
+ ::SetCursor(::LoadCursor(0, id));
}
}
}
@@ -862,7 +866,7 @@
static int EnumPixelFormats(HDC hdc) {
int iPixelFormat;
int i, n, w, weight = 0;
- PIXELFORMATDESCRIPTOR pfd, pfd_fallback;
+ PIXELFORMATDESCRIPTOR pfd;
/* we need a device context to do anything */
if(!hdc) return 0;
Modified: branches/blender2.5/blender/source/blender/windowmanager/intern/wm_window.c
===================================================================
--- branches/blender2.5/blender/source/blender/windowmanager/intern/wm_window.c 2007-12-30 22:52:00 UTC (rev 13065)
+++ branches/blender2.5/blender/source/blender/windowmanager/intern/wm_window.c 2007-12-30 23:09:33 UTC (rev 13066)
@@ -370,7 +370,7 @@
case GHOST_kEventWindowMove: {
GHOST_RectangleHandle client_rect;
int l, t, r, b, scr_w, scr_h;
- int wl, wt, wr, wb;
+ GHOST_TWindowState state;
client_rect= GHOST_GetClientBounds(win->ghostwin);
GHOST_GetRectangle(client_rect, &l, &t, &r, &b);
@@ -385,6 +385,17 @@
if(type!=GHOST_kEventWindowSize)
printf("win move event pos %d %d size %d %d\n", win->posx, win->posy, win->sizex, win->sizey);
+
+ state = GHOST_GetWindowState(win->ghostwin);
+
+ /*if(state==GHOST_kWindowStateNormal)
+ printf("window state: normal\n");
+ else if(state==GHOST_kWindowStateMinimized)
+ printf("window state: minimized\n");
+ else if(state==GHOST_kWindowStateMaximized)
+ printf("window state: maximized\n");
+ else if(state==GHOST_kWindowStateFullScreen)
+ printf("window state: fullscreen\n");*/
// window_handle(win, RESHAPE, 1);
break;
More information about the Bf-blender-cvs
mailing list