archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

* also distinguish between maximised and fullscreen on GHOST win32.

Browse Source 
* clean up some warnings (unused vars).
This commit is contained in:
Nathan Letwory
2007-12-30 23:09:33 +00:00
parent 1fec64a402
commit 0f1e7db0b7
3 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/ghost/intern/GHOST_SystemWin32.cpp
View File

@@ -225,7 +225,7 @@ bool GHOST_SystemWin32::processEvents(bool waitForEvent)
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;

12
intern/ghost/intern/GHOST_WindowWin32.cpp
View File

@@ -145,7 +145,7 @@ GHOST_WindowWin32::GHOST_WindowWin32(
}
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 @@ GHOST_TWindowState GHOST_WindowWin32::getState() const
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 @@ void GHOST_WindowWin32::loadCursor(bool visible, GHOST_TStandardCursor cursor) c
}
if (success) {
HCURSOR hCursor = ::SetCursor(::LoadCursor(0, id));
::SetCursor(::LoadCursor(0, id));
}
}
}
@@ -862,7 +866,7 @@ static int WeightPixelFormat(PIXELFORMATDESCRIPTOR& pfd) {
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;

13
source/blender/windowmanager/intern/wm_window.c
View File

@@ -370,7 +370,7 @@ int ghost_event_proc(GHOST_EventHandle evt, GHOST_TUserDataPtr private)
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 @@ int ghost_event_proc(GHOST_EventHandle evt, GHOST_TUserDataPtr private)
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;