v2.2.6

czyt1988 · Nov 26, 2024 · 6848b60 · 6848b60
1 parent f71f0dd
commit 6848b60
Show file tree

Hide file tree

Showing 3 changed files with 188 additions and 98 deletions.
diff --git a/src/SARibbon.cpp b/src/SARibbon.cpp
@@ -2248,6 +2248,10 @@ SARibbonApplicationButton::SARibbonApplicationButton(const QIcon& icon, const QS
 	setText(text);
 }
 
+SARibbonApplicationButton::~SARibbonApplicationButton()
+{
+}
+
 /*** End of inlined file: SARibbonApplicationButton.cpp ***/
 
 /*** Start of inlined file: SARibbonSystemButtonBar.cpp ***/
@@ -4170,6 +4174,10 @@ SARibbonLineWidgetContainer::SARibbonLineWidgetContainer(QWidget* par) : QWidget
 	setLayout(lay);
 }
 
+SARibbonLineWidgetContainer::~SARibbonLineWidgetContainer()
+{
+}
+
 void SARibbonLineWidgetContainer::setWidget(QWidget* innerWidget)
 {
     QHBoxLayout* lay = static_cast< QHBoxLayout* >(layout());
@@ -4855,6 +4863,10 @@ SARibbonLineEdit::SARibbonLineEdit(const QString& text, QWidget* parent) : QLine
 {
 }
 
+SARibbonLineEdit::~SARibbonLineEdit()
+{
+}
+
 /*** End of inlined file: SARibbonLineEdit.cpp ***/
 
 /*** Start of inlined file: SARibbonCheckBox.cpp ***/
@@ -4868,13 +4880,21 @@ SARibbonCheckBox::SARibbonCheckBox(const QString& text, QWidget* parent) : QChec
 {
 }
 
+SARibbonCheckBox::~SARibbonCheckBox()
+{
+}
+
 /*** End of inlined file: SARibbonCheckBox.cpp ***/
 
 /*** Start of inlined file: SARibbonComboBox.cpp ***/
 SARibbonComboBox::SARibbonComboBox(QWidget* parent) : QComboBox(parent)
 {
 }
 
+SARibbonComboBox::~SARibbonComboBox()
+{
+}
+
 /*** End of inlined file: SARibbonComboBox.cpp ***/
 
 /*** Start of inlined file: SARibbonButtonGroupWidget.cpp ***/
@@ -5224,12 +5244,6 @@ void SARibbonStackedWidget::exec()
 	d_ptr->eventLoop = nullptr;
 }
 
-/**
- * @brief 类似tabbar的moveTab函数，交换两个窗口的index
- * @param from
- * @param to
- * @note 此操作会触发widgetRemoved(int index)信号
- */
 void SARibbonStackedWidget::moveWidget(int from, int to)
 {
 	QWidget* w = widget(from);
@@ -5287,6 +5301,10 @@ SARibbonSeparatorWidget::SARibbonSeparatorWidget(QWidget* parent) : QFrame(paren
 	}
 }
 
+SARibbonSeparatorWidget::~SARibbonSeparatorWidget()
+{
+}
+
 /*** End of inlined file: SARibbonSeparatorWidget.cpp ***/
 
 /*** Start of inlined file: SARibbonCtrlContainer.cpp ***/
@@ -5563,6 +5581,10 @@ SARibbonTabBar::SARibbonTabBar(QWidget* parent) : QTabBar(parent), m_tabMargin(6
 	setExpanding(false);
 }
 
+SARibbonTabBar::~SARibbonTabBar()
+{
+}
+
 const QMargins& SARibbonTabBar::tabMargin() const
 {
 	return (m_tabMargin);
@@ -5615,10 +5637,17 @@ SARibbonControlButton::SARibbonControlButton(QWidget* parent) : QToolButton(pare
 {
 }
 
+SARibbonControlButton::~SARibbonControlButton()
+{
+}
 SARibbonControlToolButton::SARibbonControlToolButton(QWidget* parent) : QToolButton(parent)
 {
 }
 
+SARibbonControlToolButton::~SARibbonControlToolButton()
+{
+}
+
 /*** End of inlined file: SARibbonControlButton.cpp ***/
 
 /*** Start of inlined file: SARibbonMenu.cpp ***/
@@ -5634,6 +5663,10 @@ SARibbonMenu::SARibbonMenu(const QString& title, QWidget* parent) : QMenu(title,
 	setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
 }
 
+SARibbonMenu::~SARibbonMenu()
+{
+}
+
 QAction* SARibbonMenu::addRibbonMenu(SARibbonMenu* menu)
 {
 	return (QMenu::addMenu(menu));
@@ -5674,7 +5707,12 @@ SARibbonPannelOptionButton::SARibbonPannelOptionButton(QWidget* parent) : QToolB
 	setCheckable(false);
 	setToolButtonStyle(Qt::ToolButtonIconOnly);
 	setIconSize(QSize(10, 10));
-	setIcon(QIcon(":/image/resource/ribbonPannelOptionButton.png"));
+	static QIcon s_default_icon = QIcon(":/image/resource/ribbonPannelOptionButton.png");
+	setIcon(s_default_icon);
+}
+
+SARibbonPannelOptionButton::~SARibbonPannelOptionButton()
+{
 }
 
 /*** End of inlined file: SARibbonPannelOptionButton.cpp ***/
@@ -5685,6 +5723,10 @@ SARibbonPannelItem::SARibbonPannelItem(QWidget* widget)
 {
 }
 
+SARibbonPannelItem::~SARibbonPannelItem()
+{
+}
+
 bool SARibbonPannelItem::isEmpty() const
 {
 	return (action == nullptr || !action->isVisible());
@@ -8388,6 +8430,10 @@ SARibbonCategoryScrollButton::SARibbonCategoryScrollButton(Qt::ArrowType arr, QW
 	setArrowType(arr);
 }
 
+SARibbonCategoryScrollButton::~SARibbonCategoryScrollButton()
+{
+}
+
 /*** End of inlined file: SARibbonCategory.cpp ***/
 
 /*** Start of inlined file: SARibbonCategoryLayout.cpp ***/
@@ -8687,7 +8733,8 @@ void SARibbonCategoryLayout::updateGeometryArr()
 	if (!mag.isNull()) {
 		y = mag.top();
 		height -= (mag.top() + mag.bottom());
-		categoryWidth -= (mag.right() + mag.left());
+		// categoryWidth不能把mag减去，减去后会导致categoryWidth不是实际的categoryWidth
+		// categoryWidth -= (mag.right() + mag.left());
 	}
 	// total 是总宽，不是x坐标系，x才是坐标系
 	int total = d_ptr->totalSizeHintWidth();
@@ -9100,6 +9147,10 @@ SARibbonCategoryLayoutItem::SARibbonCategoryLayoutItem(SARibbonPannel* w) : QWid
 	separatorWidget = nullptr;
 }
 
+SARibbonCategoryLayoutItem::~SARibbonCategoryLayoutItem()
+{
+}
+
 SARibbonPannel* SARibbonCategoryLayoutItem::toPannelWidget()
 {
 	return qobject_cast< SARibbonPannel* >(widget());
@@ -9524,6 +9575,10 @@ SARibbonGalleryGroupItemDelegate::SARibbonGalleryGroupItemDelegate(SARibbonGalle
 {
 }
 
+SARibbonGalleryGroupItemDelegate::~SARibbonGalleryGroupItemDelegate()
+{
+}
+
 void SARibbonGalleryGroupItemDelegate::paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const
 {
 	if (nullptr == mGroup) {
@@ -10116,6 +10171,9 @@ SARibbonGalleryButton::SARibbonGalleryButton(QWidget* parent) : QToolButton(pare
 {
 }
 
+SARibbonGalleryButton::~SARibbonGalleryButton()
+{
+}
 //===================================================
 // SARibbonGalleryViewport
 //===================================================
@@ -15443,6 +15501,9 @@ SARibbonCustomizeDialog::SARibbonCustomizeDialog(SARibbonMainWindow* ribbonWindo
  * 等同@ref SARibbonCustomizeWidget::setupActionsManager
  * @param mgr
  */
+SARibbonCustomizeDialog::~SARibbonCustomizeDialog()
+{
+}
 void SARibbonCustomizeDialog::setupActionsManager(SARibbonActionsManager* mgr)
 {
 	ui->customWidget->setupActionsManager(mgr);
@@ -15907,6 +15968,10 @@ SARibbonMainWindowEventFilter::SARibbonMainWindowEventFilter(QObject* par) : QOb
 {
 }
 
+SARibbonMainWindowEventFilter::~SARibbonMainWindowEventFilter()
+{
+}
+
 bool SARibbonMainWindowEventFilter::eventFilter(QObject* obj, QEvent* e)
 {
 	if (e) {