marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mac: First startup with no resolution configuration uses desktop resolution, resolution switching from options works correctly

stable-5.3
Martin Plicht 2012-10-13 15:01:13 +02:00
parent 52feb9a67f
commit 38256bfaac
4 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/graphics/C4DrawGLMac.h
View File

@ -21,6 +21,8 @@
@class C4WindowController;
extern int ActualFullscreenX, ActualFullscreenY;
@interface C4OpenGLView : NSView
{
@private

21
src/graphics/C4DrawGLMac.mm
View File

@ -183,8 +183,8 @@ int32_t mouseButtonFromEvent(NSEvent* event, DWORD* modifierFlags)
savedMouse = CGPointMake(self.frame.size.width/2, self.frame.size.height/2);
// emulate MouseEvent assuming this method is called in game mode
::C4GUI::MouseMove(C4MC_Button_None,
savedMouse.x*Config.Graphics.ResX/self.frame.size.width,
savedMouse.y*Config.Graphics.ResY/self.frame.size.height,
savedMouse.x*ActualFullscreenX/self.frame.size.width,
savedMouse.y*ActualFullscreenY/self.frame.size.height,
0, NULL
);
}
@ -193,23 +193,23 @@ int32_t mouseButtonFromEvent(NSEvent* event, DWORD* modifierFlags)
{
DWORD flags = 0;
int32_t button = mouseButtonFromEvent(event, &flags);
int actualSizeX = Application.isEditor ? self.frame.size.width : Config.Graphics.ResX;
int actualSizeY = Application.isEditor ? self.frame.size.height : Config.Graphics.ResY;
int actualSizeX = Application.isEditor ? self.frame.size.width : ActualFullscreenX;
int actualSizeY = Application.isEditor ? self.frame.size.height : ActualFullscreenY;
if (!Application.isEditor && lionAndBeyond() && (self.window.styleMask & NSFullScreenWindowMask) == NSFullScreenWindowMask)
{
//CGWarpMouseCursorPosition(CGPointMake(actualSizeX/2, actualSizeY/2));
if (button != C4MC_Button_Wheel)
{
savedMouse.x += event.deltaX * (Config.Graphics.ResX/self.frame.size.width);
savedMouse.y -= event.deltaY * (Config.Graphics.ResY/self.frame.size.height);
savedMouse.x += event.deltaX * (ActualFullscreenX/self.frame.size.width);
savedMouse.y -= event.deltaY * (ActualFullscreenY/self.frame.size.height);
}
} else
{
savedMouse = [self convertPoint:[self.window mouseLocationOutsideOfEventStream] fromView:nil];
if (!Application.isEditor)
{
savedMouse.x *= Config.Graphics.ResX/self.frame.size.width;
savedMouse.y *= Config.Graphics.ResY/self.frame.size.height;
savedMouse.x *= ActualFullscreenX/self.frame.size.width;
savedMouse.y *= ActualFullscreenY/self.frame.size.height;
}
}
savedMouse.x = fmin(fmax(savedMouse.x, 0), actualSizeX);
@ -467,11 +467,8 @@ static NSOpenGLContext* MainContext;
NSOpenGLPixelFormat* format = [[NSOpenGLPixelFormat alloc] initWithAttributes:&attribs[0]];
NSOpenGLContext* result = [[NSOpenGLContext alloc] initWithFormat:format shareContext:pMainCtx ? pMainCtx->objectiveCObject<NSOpenGLContext>() : nil];
[self setSurfaceBackingSizeOf:result width:Config.Graphics.ResX height:Config.Graphics.ResY];
if (!MainContext)
{
MainContext = result;
}
return result;
}
@ -591,4 +588,6 @@ bool CStdGLCtx::PageFlip()
return true;
}
int ActualFullscreenX = 0, ActualFullscreenY = 0;
#endif

3
src/platform/C4AppMac.mm
View File

@ -164,6 +164,9 @@ bool C4AbstractApp::SetVideoMode(unsigned int iXRes, unsigned int iYRes, unsigne
iXRes = CGDisplayPixelsWide(C4OpenGLView.displayID);
iYRes = CGDisplayPixelsHigh(C4OpenGLView.displayID);
}
ActualFullscreenX = iXRes;
ActualFullscreenY = iYRes;
[C4OpenGLView setSurfaceBackingSizeOf:[C4OpenGLView mainContext] width:ActualFullscreenX height:ActualFullscreenY];
pWindow->SetSize(iXRes, iYRes);
[controller setFullscreen:fFullScreen];
[window setAspectRatio:[[window contentView] frame].size];

8
src/platform/C4WindowController.mm
View File

@ -175,14 +175,6 @@ bool lionAndBeyond() {return osVersion() >= 0x1070;}
viewport->ScrollBarsByViewPosition();
}
}
else
{
/*
NSSize newRes = openGLView.frame.size;
[C4OpenGLView setSurfaceBackingSizeOf:C4OpenGLView.mainContext width:newRes.width height:newRes.height];
Config.Graphics.ResX = newRes.width;
Config.Graphics.ResY = newRes.height; */
}
}
- (BOOL) isLiveResizing