mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-04-07 10:21:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix window resize on Skia/OSX

Browse Source
This commit is contained in:
David Capello 2015-10-13 18:49:56 -03:00
parent 0a1f492c24
commit 47f493df78
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/she/osx/window.h
View File

@ -34,8 +34,6 @@ public:
OSXWindowImpl* m_impl; OSXWindowImpl* m_impl;
OSXWindowDelegate* m_delegate; OSXWindowDelegate* m_delegate;
int m_scale; int m_scale;
gfx::Size m_clientSize;
gfx::Size m_restoredSize;
} }
- (OSXWindow*)initWithImpl:(OSXWindowImpl*)impl; - (OSXWindow*)initWithImpl:(OSXWindowImpl*)impl;
- (OSXWindowImpl*)impl; - (OSXWindowImpl*)impl;

8
src/she/osx/window.mm
View File

@ -23,9 +23,6 @@
m_scale = 1; m_scale = 1;
NSRect rect = NSMakeRect(0, 0, 640, 480); NSRect rect = NSMakeRect(0, 0, 640, 480);
m_clientSize.w = m_restoredSize.w = rect.size.width;
m_clientSize.h = m_restoredSize.h = rect.size.height;
self = [self initWithContentRect:rect self = [self initWithContentRect:rect
styleMask:(NSTitledWindowMask | NSClosableWindowMask | styleMask:(NSTitledWindowMask | NSClosableWindowMask |
NSMiniaturizableWindowMask | NSResizableWindowMask) NSMiniaturizableWindowMask | NSResizableWindowMask)
@ -68,12 +65,13 @@
- (gfx::Size)clientSize - (gfx::Size)clientSize
{ {
return m_clientSize; return gfx::Size([[self contentView] frame].size.width,
[[self contentView] frame].size.height);
} }
- (gfx::Size)restoredSize - (gfx::Size)restoredSize
{ {
return m_restoredSize; return [self clientSize];
} }
@end @end