From c87fff08d611f86fe779f6c975febff027385092 Mon Sep 17 00:00:00 2001 From: Kristian Bendiksen Date: Fri, 11 Sep 2026 12:17:41 +0200 Subject: [PATCH] Revert "#14714 Add opt-in native window for 3D viewers" This reverts commit aa3ec82e1c12b85fde5a284e7d9b63df066f96cc. --- Fwk/AppFwk/cafViewer/CMakeLists.txt | 1 - Fwk/AppFwk/cafViewer/cafViewer.cpp | 12 ------------ ThirdParty/qtadvanceddocking | 2 +- 3 files changed, 1 insertion(+), 14 deletions(-) diff --git a/Fwk/AppFwk/cafViewer/CMakeLists.txt b/Fwk/AppFwk/cafViewer/CMakeLists.txt index b6f48e6f37..d7a7d2d8ef 100644 --- a/Fwk/AppFwk/cafViewer/CMakeLists.txt +++ b/Fwk/AppFwk/cafViewer/CMakeLists.txt @@ -42,7 +42,6 @@ target_link_libraries( LibRender LibGuiQt cafAnimControl - cafPdmCore ${QT_LIBRARIES} ) diff --git a/Fwk/AppFwk/cafViewer/cafViewer.cpp b/Fwk/AppFwk/cafViewer/cafViewer.cpp index b8c77af095..109d3a02d9 100644 --- a/Fwk/AppFwk/cafViewer/cafViewer.cpp +++ b/Fwk/AppFwk/cafViewer/cafViewer.cpp @@ -39,7 +39,6 @@ #include "cafCadNavigation.h" #include "cafFrameAnimationControl.h" #include "cafNavigationPolicy.h" -#include "cafPdmLogging.h" #include "cafPointOfInterestVisualizer.h" #include "cvfCamera.h" @@ -143,17 +142,6 @@ caf::Viewer::Viewer( QWidget* parent ) setAutoFillBackground( false ); setMouseTracking( true ); - // A non-native widget is composited into the top-level backing store, and that composition is not - // refreshed when the dock system switches tabs, leaving the shown view black. A native surface - // skips compositing, but becomes a subsurface on Wayland, so keep it opt-in. - if ( qEnvironmentVariableIntValue( "RESINSIGHT_ENABLE_NATIVE_GL_WIDGET" ) > 0 ) - { - setAttribute( Qt::WA_NativeWindow ); - - CAF_PDM_LOG_INFO( - QString( "RESINSIGHT_ENABLE_NATIVE_GL_WIDGET is set, using a native window for the 3D viewer" ) ); - } - // Needed to get keystrokes setFocusPolicy( Qt::ClickFocus ); diff --git a/ThirdParty/qtadvanceddocking b/ThirdParty/qtadvanceddocking index 2e2930248c..beccbbfb3c 160000 --- a/ThirdParty/qtadvanceddocking +++ b/ThirdParty/qtadvanceddocking @@ -1 +1 @@ -Subproject commit 2e2930248c02aa1b208090bb8659503f4687ae2f +Subproject commit beccbbfb3c2cfdd927e0d27ce266f525cfb457bf