mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-01 06:45:32 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2250 from akortunov/guifixes

Browse source 
Do not swap buffers for non-exposed windows
This commit is contained in:
Bret Curtis 2019-03-13 14:39:03 +01:00 committed by GitHub
commit d794547e63
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -40,6 +40,7 @@
Bug #4876: AI ratings handling inconsistencies Bug #4876: AI ratings handling inconsistencies
Bug #4877: Startup script executes only on a new game start Bug #4877: Startup script executes only on a new game start
Bug #4888: Global variable stray explicit reference calls break script compilation Bug #4888: Global variable stray explicit reference calls break script compilation
Bug #4911: Editor: QOpenGLContext::swapBuffers() warning with Qt5
Feature #2229: Improve pathfinding AI Feature #2229: Improve pathfinding AI
Feature #3442: Default values for fallbacks from ini file Feature #3442: Default values for fallbacks from ini file
Feature #3610: Option to invert X axis Feature #3610: Option to invert X axis

7
extern/osgQt/GraphicsWindowQt.cpp vendored
View file

@ -17,6 +17,7 @@
#include <osgViewer/ViewerBase> #include <osgViewer/ViewerBase>
#include <QInputEvent> #include <QInputEvent>
#include <QPointer> #include <QPointer>
#include <QWindow>
#if (QT_VERSION>=QT_VERSION_CHECK(4, 6, 0)) #if (QT_VERSION>=QT_VERSION_CHECK(4, 6, 0))
# define USE_GESTURES # define USE_GESTURES
@ -518,6 +519,12 @@ bool GraphicsWindowQt::releaseContextImplementation()
void GraphicsWindowQt::swapBuffersImplementation() void GraphicsWindowQt::swapBuffersImplementation()
{ {
#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
// QOpenGLContext complains if we swap on an non-exposed QWindow
if (!_widget || !_widget->windowHandle()->isExposed())
return;
#endif
_widget->swapBuffers(); _widget->swapBuffers();
// FIXME: the processDeferredEvents should really be executed in a GUI (main) thread context but // FIXME: the processDeferredEvents should really be executed in a GUI (main) thread context but