From 23f8aea9900f18cb9621782f92709e92e602a767 Mon Sep 17 00:00:00 2001 From: sunwen Date: Thu, 20 Jun 2024 15:50:39 +0800 Subject: [PATCH] fix: Delete gui gestures in MainWindow. --- src/main.cpp | 8 +-- src/windows/MainWindow.cpp | 118 ++++++++++++++++++------------------- src/windows/MainWindow.h | 10 ++-- 3 files changed, 68 insertions(+), 68 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index f07ef22..f84ebfc 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -98,10 +98,10 @@ int main(int argc, char* argv[]) SystemOperationLog::getInstance(); QObject::connect(TouchScreenSignalSender::getInstance(), SIGNAL(touchScreen()), Locker::getInstance(), SLOT(refreshTimer())); - QList gestures; - gestures << Qt::SwipeGesture; - gestures << Qt::PanGesture; - w.grabGestures(gestures); + // QList gestures; + // gestures << Qt::SwipeGesture; + // gestures << Qt::PanGesture; + // w.grabGestures(gestures); QStringList app_args = a.arguments(); int ret = 0; diff --git a/src/windows/MainWindow.cpp b/src/windows/MainWindow.cpp index 8e56002..e7d8d56 100644 --- a/src/windows/MainWindow.cpp +++ b/src/windows/MainWindow.cpp @@ -247,14 +247,14 @@ void MainWindow::triggerInfo(const QPair& aInfoData) //------events----------------------------------------------------------------- //! [event handler] -bool MainWindow::event(QEvent* aEvent) -{ - if (aEvent->type() == QEvent::Gesture) - { - return gestureEvent(static_cast(aEvent)); - } - return QMainWindow::event(aEvent); -} +//bool MainWindow::event(QEvent* aEvent) +//{ +// if (aEvent->type() == QEvent::Gesture) +// { +// return gestureEvent(static_cast(aEvent)); +// } +// return QMainWindow::event(aEvent); +//} void MainWindow::changeEvent(QEvent* aEvent) { @@ -283,61 +283,61 @@ void MainWindow::keyPressEvent(QKeyEvent *event) { QWidget::keyPressEvent(event); } -bool MainWindow::gestureEvent(QGestureEvent* aGestureEvent) -{ - if (QGesture* swipe = aGestureEvent->gesture(Qt::SwipeGesture)) - { - swipeTriggered(static_cast(swipe)); - } - if (QGesture* pan = aGestureEvent->gesture(Qt::PanGesture)) - { - panTriggered(static_cast(pan)); - } - return true; -} +//bool MainWindow::gestureEvent(QGestureEvent* aGestureEvent) +//{ +// if (QGesture* swipe = aGestureEvent->gesture(Qt::SwipeGesture)) +// { +// swipeTriggered(static_cast(swipe)); +// } +// if (QGesture* pan = aGestureEvent->gesture(Qt::PanGesture)) +// { +// panTriggered(static_cast(pan)); +// } +// return true; +//} -void MainWindow::grabGestures(const QList& aGestures) -{ - //! [enable gestures] - foreach(Qt::GestureType gesture, aGestures) - { - grabGesture(gesture); - } - //! [enable gestures] -} +//void MainWindow::grabGestures(const QList& aGestures) +//{ +// //! [enable gestures] +// foreach(Qt::GestureType gesture, aGestures) +// { +// grabGesture(gesture); +// } +// //! [enable gestures] +//} -void MainWindow::panTriggered(QPanGesture* aPanGesture) -{ - if (aPanGesture->state() == Qt::GestureFinished) - { - QPointF delta = aPanGesture->offset(); - int index = mTabWidget->currentIndex(); - if (delta.x() > 50) - { +//void MainWindow::panTriggered(QPanGesture* aPanGesture) +//{ +// if (aPanGesture->state() == Qt::GestureFinished) +// { +// QPointF delta = aPanGesture->offset(); +// int index = mTabWidget->currentIndex(); +// if (delta.x() > 50) +// { - index--; - if (index >= 0) - { - mTabWidget->setCurrentIndex(index); - } - } - if (delta.x() < -50) - { - index++; - if (index < mTabWidget->count()) - { - mTabWidget->setCurrentIndex(index); - } - } - } -} +// index--; +// if (index >= 0) +// { +// mTabWidget->setCurrentIndex(index); +// } +// } +// if (delta.x() < -50) +// { +// index++; +// if (index < mTabWidget->count()) +// { +// mTabWidget->setCurrentIndex(index); +// } +// } +// } +//} -void MainWindow::swipeTriggered(QSwipeGesture* aSwipeGesture) -{ - if (aSwipeGesture->state() == Qt::GestureFinished) - { - } -} +//void MainWindow::swipeTriggered(QSwipeGesture* aSwipeGesture) +//{ +// if (aSwipeGesture->state() == Qt::GestureFinished) +// { +// } +//} //------actions & slots-------------------------------------------------------- diff --git a/src/windows/MainWindow.h b/src/windows/MainWindow.h index bc65a94..f839a66 100644 --- a/src/windows/MainWindow.h +++ b/src/windows/MainWindow.h @@ -31,7 +31,7 @@ public: void centerWidgetHide(); void centerWidgetShow(); void requestScreenSaver(); - void grabGestures(const QList& aGestures); + //void grabGestures(const QList& aGestures); public slots: void requestLogin(); @@ -40,16 +40,16 @@ public slots: protected: void changeEvent(QEvent* aEvent) override; - bool event(QEvent* aEvent) override; +// bool event(QEvent* aEvent) override; void keyPressEvent(QKeyEvent *event) override; private: void initializeTabWidget(); void initializeLayout(); - bool gestureEvent(QGestureEvent* aGestureEvent); - void swipeTriggered(QSwipeGesture* aSwipeGesture); - void panTriggered(QPanGesture* aPanGesture); +// bool gestureEvent(QGestureEvent* aGestureEvent); +// void swipeTriggered(QSwipeGesture* aSwipeGesture); +// void panTriggered(QPanGesture* aPanGesture); void loadStyleSheet(const QString& aSheetName); void showShutdownWidget(); void processShutdownDmsFailed();