|
|
@ -25,7 +25,6 @@ public: |
|
|
ComPtr<IAvnGlContext> _glContext; |
|
|
ComPtr<IAvnGlContext> _glContext; |
|
|
NSObject<IRenderTarget>* renderTarget; |
|
|
NSObject<IRenderTarget>* renderTarget; |
|
|
AvnPoint lastPositionSet; |
|
|
AvnPoint lastPositionSet; |
|
|
CGSize _lastRequestedSize; |
|
|
|
|
|
NSString* _lastTitle; |
|
|
NSString* _lastTitle; |
|
|
IAvnMenu* _mainMenu; |
|
|
IAvnMenu* _mainMenu; |
|
|
|
|
|
|
|
|
@ -201,11 +200,7 @@ public: |
|
|
ret->Width = frame.size.width; |
|
|
ret->Width = frame.size.width; |
|
|
ret->Height = frame.size.height; |
|
|
ret->Height = frame.size.height; |
|
|
} |
|
|
} |
|
|
else |
|
|
|
|
|
{ |
|
|
|
|
|
ret->Width = _lastRequestedSize.width; |
|
|
|
|
|
ret->Height = _lastRequestedSize.height; |
|
|
|
|
|
} |
|
|
|
|
|
return S_OK; |
|
|
return S_OK; |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
@ -266,8 +261,10 @@ public: |
|
|
y = maxSize.height; |
|
|
y = maxSize.height; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
_lastRequestedSize.width = x; |
|
|
if(!_shown) |
|
|
_lastRequestedSize.height = y; |
|
|
{ |
|
|
|
|
|
BaseEvents->Resized(AvnSize{x,y}); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
[Window setContentSize:NSSize{x, y}]; |
|
|
[Window setContentSize:NSSize{x, y}]; |
|
|
|
|
|
|
|
|
|