Cleanup: ws
This commit is contained in:
parent
11e7679d1c
commit
5918fcb5e7
|
@ -302,8 +302,8 @@ enum {
|
|||
|
||||
/* Start or continue composing? */
|
||||
if ([[event characters] length] == 0 ||
|
||||
[[event charactersIgnoringModifiers] length] == 0 ||
|
||||
composing)
|
||||
[[event charactersIgnoringModifiers] length] == 0 ||
|
||||
composing)
|
||||
{
|
||||
composing = YES;
|
||||
|
||||
|
@ -569,8 +569,9 @@ GHOST_WindowCocoa::GHOST_WindowCocoa(
|
|||
rect.size.height = height;
|
||||
|
||||
m_window = [[CocoaWindow alloc] initWithContentRect:rect
|
||||
styleMask:NSTitledWindowMask | NSClosableWindowMask | NSResizableWindowMask | NSMiniaturizableWindowMask
|
||||
backing:NSBackingStoreBuffered defer:NO];
|
||||
styleMask:NSTitledWindowMask | NSClosableWindowMask | NSResizableWindowMask | NSMiniaturizableWindowMask
|
||||
backing:NSBackingStoreBuffered defer:NO];
|
||||
|
||||
if (m_window == nil) {
|
||||
[pool drain];
|
||||
return;
|
||||
|
@ -623,7 +624,7 @@ GHOST_WindowCocoa::GHOST_WindowCocoa(
|
|||
#endif
|
||||
|
||||
[m_window registerForDraggedTypes:[NSArray arrayWithObjects:NSFilenamesPboardType,
|
||||
NSStringPboardType, NSTIFFPboardType, nil]];
|
||||
NSStringPboardType, NSTIFFPboardType, nil]];
|
||||
|
||||
#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1060
|
||||
if (state != GHOST_kWindowStateFullScreen) {
|
||||
|
@ -786,7 +787,7 @@ void GHOST_WindowCocoa::getClientBounds(GHOST_Rect& bounds) const
|
|||
|
||||
//Max window contents as screen size (excluding title bar...)
|
||||
NSRect contentRect = [CocoaWindow contentRectForFrameRect:screenSize
|
||||
styleMask:(NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask)];
|
||||
styleMask:(NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask)];
|
||||
|
||||
rect = [m_window contentRectForFrameRect:[m_window frame]];
|
||||
|
||||
|
@ -848,7 +849,7 @@ GHOST_TSuccess GHOST_WindowCocoa::setClientSize(GHOST_TUns32 width, GHOST_TUns32
|
|||
GHOST_Rect cBnds, wBnds;
|
||||
getClientBounds(cBnds);
|
||||
if ((((GHOST_TUns32)cBnds.getWidth()) != width) ||
|
||||
(((GHOST_TUns32)cBnds.getHeight()) != height))
|
||||
(((GHOST_TUns32)cBnds.getHeight()) != height))
|
||||
{
|
||||
NSSize size;
|
||||
size.width=width;
|
||||
|
@ -894,7 +895,7 @@ GHOST_TWindowState GHOST_WindowCocoa::getState() const
|
|||
state = GHOST_kWindowStateFullScreen;
|
||||
}
|
||||
else {
|
||||
state = GHOST_kWindowStateNormal;
|
||||
state = GHOST_kWindowStateNormal;
|
||||
}
|
||||
}
|
||||
[pool drain];
|
||||
|
@ -1038,10 +1039,10 @@ GHOST_TSuccess GHOST_WindowCocoa::setState(GHOST_TWindowState state)
|
|||
}
|
||||
//Create a fullscreen borderless window
|
||||
CocoaWindow *tmpWindow = [[CocoaWindow alloc]
|
||||
initWithContentRect:[[m_window screen] frame]
|
||||
styleMask:NSBorderlessWindowMask
|
||||
backing:NSBackingStoreBuffered
|
||||
defer:YES];
|
||||
initWithContentRect:[[m_window screen] frame]
|
||||
styleMask:NSBorderlessWindowMask
|
||||
backing:NSBackingStoreBuffered
|
||||
defer:YES];
|
||||
//Copy current window parameters
|
||||
[tmpWindow setTitle:[m_window title]];
|
||||
[tmpWindow setRepresentedFilename:[m_window representedFilename]];
|
||||
|
@ -1049,7 +1050,7 @@ GHOST_TSuccess GHOST_WindowCocoa::setState(GHOST_TWindowState state)
|
|||
[tmpWindow setDelegate:[m_window delegate]];
|
||||
[tmpWindow setSystemAndWindowCocoa:[m_window systemCocoa] windowCocoa:this];
|
||||
[tmpWindow registerForDraggedTypes:[NSArray arrayWithObjects:NSFilenamesPboardType,
|
||||
NSStringPboardType, NSTIFFPboardType, nil]];
|
||||
NSStringPboardType, NSTIFFPboardType, nil]];
|
||||
|
||||
//Assign the openGL view to the new window
|
||||
[tmpWindow setContentView:m_openGLView];
|
||||
|
@ -1108,10 +1109,10 @@ GHOST_TSuccess GHOST_WindowCocoa::setState(GHOST_TWindowState state)
|
|||
}
|
||||
//Create a fullscreen borderless window
|
||||
CocoaWindow *tmpWindow = [[CocoaWindow alloc]
|
||||
initWithContentRect:[[m_window screen] frame]
|
||||
styleMask:(NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask)
|
||||
backing:NSBackingStoreBuffered
|
||||
defer:YES];
|
||||
initWithContentRect:[[m_window screen] frame]
|
||||
styleMask:(NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask)
|
||||
backing:NSBackingStoreBuffered
|
||||
defer:YES];
|
||||
//Copy current window parameters
|
||||
[tmpWindow setTitle:[m_window title]];
|
||||
[tmpWindow setRepresentedFilename:[m_window representedFilename]];
|
||||
|
@ -1119,7 +1120,7 @@ GHOST_TSuccess GHOST_WindowCocoa::setState(GHOST_TWindowState state)
|
|||
[tmpWindow setDelegate:[m_window delegate]];
|
||||
[tmpWindow setSystemAndWindowCocoa:[m_window systemCocoa] windowCocoa:this];
|
||||
[tmpWindow registerForDraggedTypes:[NSArray arrayWithObjects:NSFilenamesPboardType,
|
||||
NSStringPboardType, NSTIFFPboardType, nil]];
|
||||
NSStringPboardType, NSTIFFPboardType, nil]];
|
||||
//Forbid to resize the window below the blender defined minimum one
|
||||
[tmpWindow setContentMinSize:NSMakeSize(320, 240)];
|
||||
|
||||
|
@ -1514,7 +1515,7 @@ static GHOST_TUns16 uns16ReverseBits(GHOST_TUns16 shrt)
|
|||
}
|
||||
|
||||
GHOST_TSuccess GHOST_WindowCocoa::setWindowCustomCursorShape(GHOST_TUns8 *bitmap, GHOST_TUns8 *mask,
|
||||
int sizex, int sizey, int hotX, int hotY, int fg_color, int bg_color)
|
||||
int sizex, int sizey, int hotX, int hotY, int fg_color, int bg_color)
|
||||
{
|
||||
int y,nbUns16;
|
||||
NSPoint hotSpotPoint;
|
||||
|
@ -1569,7 +1570,7 @@ GHOST_TSuccess GHOST_WindowCocoa::setWindowCustomCursorShape(GHOST_TUns8 *bitmap
|
|||
|
||||
//foreground and background color parameter is not handled for now (10.6)
|
||||
m_customCursor = [[NSCursor alloc] initWithImage:cursorImage
|
||||
hotSpot:hotSpotPoint];
|
||||
hotSpot:hotSpotPoint];
|
||||
|
||||
[cursorImageRep release];
|
||||
[cursorImage release];
|
||||
|
@ -1582,7 +1583,7 @@ GHOST_TSuccess GHOST_WindowCocoa::setWindowCustomCursorShape(GHOST_TUns8 *bitmap
|
|||
}
|
||||
|
||||
GHOST_TSuccess GHOST_WindowCocoa::setWindowCustomCursorShape(GHOST_TUns8 bitmap[16][2],
|
||||
GHOST_TUns8 mask[16][2], int hotX, int hotY)
|
||||
GHOST_TUns8 mask[16][2], int hotX, int hotY)
|
||||
{
|
||||
return setWindowCustomCursorShape((GHOST_TUns8*)bitmap, (GHOST_TUns8*) mask, 16, 16, hotX, hotY, 0, 1);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue