From 14371ab60d484cb066c0db4a330fb5d54d3ab8db Mon Sep 17 00:00:00 2001 From: czyt1988 Date: Tue, 30 Jul 2024 16:34:28 +0800 Subject: [PATCH] =?UTF-8?q?hotfix:=E4=BF=AE=E6=AD=A3qwk=E4=B8=8B=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=AE=89=E8=A3=85=E4=BA=8B=E4=BB=B6=E7=9A=84=E5=BC=82?= =?UTF-8?q?=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/SARibbon.cpp | 6 +++--- src/SARibbon.h | 2 +- src/SARibbonBar/SARibbonGlobal.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/SARibbon.cpp b/src/SARibbon.cpp index 8e0723a..35f8fd1 100644 --- a/src/SARibbon.cpp +++ b/src/SARibbon.cpp @@ -15667,13 +15667,13 @@ void SARibbonMainWindow::setRibbonBar(SARibbonBar* ribbon) #else // 捕获ribbonbar的事件 ribbon->installEventFilter(this); - // SARibbonSystemButtonBar的eventfilter捕获mainwindow的事件 - // 通过eventerfilter来处理mainwindow的事件，避免用户错误的继承resizeEvent导致systembar的位置异常 - installEventFilter(sysBar); // 设置窗体的标题栏高度 d_ptr->mFramelessHelper->setTitleHeight(th); d_ptr->mFramelessHelper->setRubberBandOnResize(false); #endif + // SARibbonSystemButtonBar的eventfilter捕获mainwindow的事件 + // 通过eventerfilter来处理mainwindow的事件，避免用户错误的继承resizeEvent导致systembar的位置异常 + installEventFilter(sysBar); if (!d_ptr->mEventFilter) { d_ptr->mEventFilter = new SARibbonMainWindowEventFilter(this); installEventFilter(d_ptr->mEventFilter); diff --git a/src/SARibbon.h b/src/SARibbon.h index 2a6e6ea..b0aa5ad 100644 --- a/src/SARibbon.h +++ b/src/SARibbon.h @@ -101,7 +101,7 @@ class QWidget; * @def ribbon的数字版本 MAJ.MIN.{PAT} */ #ifndef SA_RIBBON_BAR_VERSION_PAT -#define SA_RIBBON_BAR_VERSION_PAT 1 +#define SA_RIBBON_BAR_VERSION_PAT 3 #endif #ifndef SA_RIBBON_BAR_NO_EXPORT diff --git a/src/SARibbonBar/SARibbonGlobal.h b/src/SARibbonBar/SARibbonGlobal.h index e8c0d60..c7f27ae 100644 --- a/src/SARibbonBar/SARibbonGlobal.h +++ b/src/SARibbonBar/SARibbonGlobal.h @@ -24,7 +24,7 @@ class QWidget; * @def ribbon的数字版本 MAJ.MIN.{PAT} */ #ifndef SA_RIBBON_BAR_VERSION_PAT -#define SA_RIBBON_BAR_VERSION_PAT 1 +#define SA_RIBBON_BAR_VERSION_PAT 3 #endif #ifndef SA_RIBBON_BAR_NO_EXPORT