From d48dcd8bb0c54505b25257b218468b93d2e75c91 Mon Sep 17 00:00:00 2001 From: Alfredo Monclus Date: Sat, 7 Jun 2025 19:40:50 -0600 Subject: [PATCH] Gui: remove taskheader animation --- .../QSint/actionpanel/actionpanelscheme.cpp | 1 - src/Gui/QSint/actionpanel/actionpanelscheme.h | 5 -- src/Gui/QSint/actionpanel/taskheader_p.cpp | 66 ------------------- src/Gui/QSint/actionpanel/taskheader_p.h | 11 ---- 4 files changed, 83 deletions(-) diff --git a/src/Gui/QSint/actionpanel/actionpanelscheme.cpp b/src/Gui/QSint/actionpanel/actionpanelscheme.cpp index 10f9d321e5..70442bfeb7 100644 --- a/src/Gui/QSint/actionpanel/actionpanelscheme.cpp +++ b/src/Gui/QSint/actionpanel/actionpanelscheme.cpp @@ -63,7 +63,6 @@ ActionPanelScheme::ActionPanelScheme() { QFontMetrics fm(QApplication::font()); headerSize = fm.height() + 10; - headerAnimation = true; QPalette p = QApplication::palette(); diff --git a/src/Gui/QSint/actionpanel/actionpanelscheme.h b/src/Gui/QSint/actionpanel/actionpanelscheme.h index bfd590639c..b3a3cb3e88 100644 --- a/src/Gui/QSint/actionpanel/actionpanelscheme.h +++ b/src/Gui/QSint/actionpanel/actionpanelscheme.h @@ -58,11 +58,6 @@ public: */ int headerSize; - /** - * @brief Whether mouseover on the header triggers a slow opacity change. - */ - bool headerAnimation; - /** * @brief Image of the folding button when the group is expanded. */ diff --git a/src/Gui/QSint/actionpanel/taskheader_p.cpp b/src/Gui/QSint/actionpanel/taskheader_p.cpp index 524764d35d..977273507e 100644 --- a/src/Gui/QSint/actionpanel/taskheader_p.cpp +++ b/src/Gui/QSint/actionpanel/taskheader_p.cpp @@ -25,7 +25,6 @@ TaskHeader::TaskHeader(const QIcon &icon, const QString &title, bool expandable, m_over(false), m_buttonOver(false), m_fold(true), - m_opacity(0.1), myButton(nullptr) { setProperty("class", "header"); @@ -120,71 +119,6 @@ void TaskHeader::setScheme(ActionPanelScheme *scheme) } } -void TaskHeader::paintEvent ( QPaintEvent * event ) -{ - QPainter p(this); - - if (myScheme->headerAnimation) { - p.setOpacity(m_opacity+0.7); - } - - BaseClass::paintEvent(event); -} - -void TaskHeader::animate() -{ - if (!myScheme->headerAnimation) { - return; - } - - if (!isEnabled()) { - m_opacity = 0.1; - update(); - return; - } - - if (m_over) { - if (m_opacity >= 0.3) { - m_opacity = 0.3; - return; - } - m_opacity += 0.05; - } else { - if (m_opacity <= 0.1) { - m_opacity = 0.1; - return; - } - m_opacity = qMax(0.1, m_opacity-0.05); - } - - QTimer::singleShot(100, this, &TaskHeader::animate); - update(); -} - -#if QT_VERSION < QT_VERSION_CHECK(6,0,0) -void TaskHeader::enterEvent ( QEvent * /*event*/ ) -#else -void TaskHeader::enterEvent ( QEnterEvent * /*event*/ ) -#endif -{ - m_over = true; - - if (isEnabled()) { - QTimer::singleShot(100, this, &TaskHeader::animate); - } - update(); -} - -void TaskHeader::leaveEvent ( QEvent * /*event*/ ) -{ - m_over = false; - - if (isEnabled()) { - QTimer::singleShot(100, this, &TaskHeader::animate); - } - update(); -} - void TaskHeader::fold() { if (myExpandable) { diff --git a/src/Gui/QSint/actionpanel/taskheader_p.h b/src/Gui/QSint/actionpanel/taskheader_p.h index 84c6168ea6..c77ba37a02 100644 --- a/src/Gui/QSint/actionpanel/taskheader_p.h +++ b/src/Gui/QSint/actionpanel/taskheader_p.h @@ -43,17 +43,7 @@ public: public Q_SLOTS: void fold(); -protected Q_SLOTS: - void animate(); - protected: - void paintEvent ( QPaintEvent * event ) override; -#if QT_VERSION < QT_VERSION_CHECK(6,0,0) - void enterEvent ( QEvent * event ) override; -#else - void enterEvent ( QEnterEvent * event ) override; -#endif - void leaveEvent ( QEvent * event ) override; void mouseReleaseEvent ( QMouseEvent * event ) override; void keyPressEvent ( QKeyEvent * event ) override; void keyReleaseEvent ( QKeyEvent * event ) override; @@ -66,7 +56,6 @@ protected: bool myExpandable; bool m_over, m_buttonOver, m_fold; - double m_opacity; ActionLabel *myTitle; QLabel *myButton;