Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: #1013 Viewport size when embedding NeL Cocoa view in Qt

Browse source
This commit is contained in:
rti 2010-10-31 20:53:14 +01:00
parent 6a2c5daad8
commit 56b667194f
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
code/nel/src/3d/driver/opengl/driver_opengl_window.cpp
View file

@ -913,6 +913,22 @@ bool CDriverGL::setDisplay(nlWindow wnd, const GfxMode &mode, bool show, bool re
else else
{ {
_win = wnd; _win = wnd;
/* The NSView* extracted from a QWidget using winId() has bounds set to
* (QWidget::x(), QWidget::y(), QWidget::width(), QWidget::height()).
* This causes cocoa to draw at an offset of x(), y() leaving an unhandled
* border in the NSView. The code below fixes this by translating the
* coordinate system of the NSView back to 0,0.
* In my opinion this is an error in Qt since QWidget::x/y() are relative to
* parent and [NSView bounds.origin] is relative to it's own coordinate
* system. This are incompatible notations. Qt should handle the conversion.
* Fixes: #1013 Viewport size when embedding NeL Cocoa view in Qt
* (http://dev.ryzom.com/issues/1013)
*/
NSView* view = (NSView*)wnd;
if(view.frame.origin.x != 0 || view.frame.origin.y != 0) {
[view setBoundsOrigin:view.frame.origin];
}
} }
// setup opengl settings // setup opengl settings