From 6d31a50f5d146dd6205e3bcff0226eadb828a92e Mon Sep 17 00:00:00 2001 From: dfighter1985 Date: Tue, 9 Jul 2013 20:22:00 +0200 Subject: [PATCH] I'll give up, I don't know why wheel events are not passed over to this widget as native events. Fortunately they are not needed, since the Nel style 3d mouse listener doesn't use them. --HG-- branch : gsoc2013-dfighter --- .../src/plugins/material_editor/viewport_widget.cpp | 10 ---------- .../src/plugins/material_editor/viewport_widget.h | 2 -- 2 files changed, 12 deletions(-) diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/material_editor/viewport_widget.cpp b/code/nel/tools/3d/object_viewer_qt/src/plugins/material_editor/viewport_widget.cpp index 871141730..e4d1f790a 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/plugins/material_editor/viewport_widget.cpp +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/material_editor/viewport_widget.cpp @@ -77,22 +77,12 @@ namespace MaterialEditor update(); } - void ViewPortWidget::wheelEvent( QWheelEvent *evnt ) - { - QWidget::wheelEvent( evnt ); - } - #if defined( NL_OS_WINDOWS ) typedef bool ( *winProc )( NL3D::IDriver *driver, HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam ); bool ViewPortWidget::winEvent( MSG *message, long *result ) { - if( message->message == WM_MOUSEWHEEL ) - { - printf( "" ); - } - NL3D::UDriver *udriver = nl3dIface->getDriver(); if( ( udriver != NULL ) && udriver->isActive() ) { diff --git a/code/nel/tools/3d/object_viewer_qt/src/plugins/material_editor/viewport_widget.h b/code/nel/tools/3d/object_viewer_qt/src/plugins/material_editor/viewport_widget.h index d7af9ccfc..081cad53a 100644 --- a/code/nel/tools/3d/object_viewer_qt/src/plugins/material_editor/viewport_widget.h +++ b/code/nel/tools/3d/object_viewer_qt/src/plugins/material_editor/viewport_widget.h @@ -46,8 +46,6 @@ namespace MaterialEditor void timerEvent( QTimerEvent *evnt ); - void wheelEvent( QWheelEvent *evnt ); - #if defined ( NL_OS_WINDOWS ) bool winEvent( MSG *message, long *result ); #elif defined( NL_OS_MAC )