fix: adapt compact mode

adapt compact mode Log: adpat compact mode Bug: https://pms.uniontech.com/bug-view-279779.html
linuxdeepin · Nov 7, 2024 · e4f573f · e4f573f
1 parent 03dbe6d
commit e4f573f
Show file tree

Hide file tree

Showing 9 changed files with 164 additions and 2 deletions.
diff --git a/application/filtercontent.cpp b/application/filtercontent.cpp
@@ -32,6 +32,7 @@
 
 #define BUTTON_WIDTH_MIN 68
 #define BUTTON_HEIGHT_MIN 36
+#define BUTTON_HEIGHT_MIN_COMPACT 24
 #define BUTTON_EXPORT_WIDTH_MIN 142
 #define FONT_20_MIN_WIDTH 821
 #define FONT_18_MIN_WIDTH 100
@@ -250,6 +251,11 @@ void FilterContent::initConnections()
     connect(typeCbx, SIGNAL(currentIndexChanged(int)), this,
             SLOT(slot_cbxLogTypeChanged(int)));  // add by Airy
     connect(auditTypeCbx, SIGNAL(currentIndexChanged(int)), this, SLOT(slot_cbxAuditTypeChanged(int)));
+#ifdef DTKWIDGET_CLASS_DSizeMode
+    // 紧凑模式信号处理
+    connect(DGuiApplicationHelper::instance(), &DGuiApplicationHelper::sizeModeChanged, this, &FilterContent::updateSizeMode);
+    updateSizeMode();
+#endif
 }
 
 /**
@@ -956,3 +962,38 @@ void FilterContent::setChangedcomboxstate(bool value)
 {
     m_bIsCombox = value;
 }
+
+void FilterContent::updateSizeMode()
+{
+    int nBtnHeight = BUTTON_HEIGHT_MIN;
+#ifdef DTKWIDGET_CLASS_DSizeMode
+    if (DGuiApplicationHelper::isCompactMode())
+        nBtnHeight = BUTTON_HEIGHT_MIN_COMPACT;
+    else
+        nBtnHeight = BUTTON_HEIGHT_MIN;
+#else
+    nBtnHeight = BUTTON_HEIGHT_MIN;
+#endif
+
+    if (cbx_lv) {
+        cbx_lv->setMinimumSize(QSize(LEVEL_COMBO_WIDTH, nBtnHeight));
+    }
+    if (cbx_dnf_lv) {
+        cbx_dnf_lv->setMinimumSize(QSize(LEVEL_COMBO_WIDTH, nBtnHeight));
+    }
+    if (cbx_app) {
+        cbx_app->setMinimumSize(QSize(LEVEL_COMBO_WIDTH, nBtnHeight));
+    }
+    if (cbx_submodule) {
+        cbx_submodule->setMinimumSize(QSize(LEVEL_COMBO_WIDTH, nBtnHeight));
+    }
+    if (cbx_status) {
+        cbx_status->setMinimumSize(QSize(LEVEL_COMBO_WIDTH, nBtnHeight));
+    }
+    if (typeCbx) {
+        typeCbx->setMinimumSize(QSize(LEVEL_COMBO_WIDTH, nBtnHeight));
+    }
+    if (auditTypeCbx) {
+        auditTypeCbx->setMinimumSize(QSize(LEVEL_COMBO_WIDTH, nBtnHeight));
+    }
+}
diff --git a/application/filtercontent.h b/application/filtercontent.h
@@ -58,6 +58,12 @@ class FilterContent : public Dtk::Widget::DFrame
      * @param value
      */
     void setChangedcomboxstate(bool value);
+
+private slots:
+    /**
+     * @brief 根据布局模式(紧凑)变更更新界面布局
+     */
+    void updateSizeMode();
 protected:
     //  void resizeEvent(QResizeEvent *event) override;
     void paintEvent(QPaintEvent *event) override;

diff --git a/application/logcollectormain.cpp b/application/logcollectormain.cpp
@@ -36,6 +36,9 @@
 #define LEFT_LIST_WIDTH 200
 DWIDGET_USE_NAMESPACE
 
+const int BUTTON_SIZE  = 36;
+const int BUTTON_SIZE_COMPACT = 24;
+
 //刷新间隔
 static const QString refreshIntervalKey = "base.RefreshInterval";
 /**
@@ -429,6 +432,12 @@ void LogCollectorMain::initConnection()
     connect(m_topRightWgt, &FilterContent::sigStatusChanged, this, &LogCollectorMain::slotClearInfoandFocus);
     //开关机日志下拉框选项切换清空搜索栏
     connect(m_topRightWgt, &FilterContent::sigLogtypeChanged, this, &LogCollectorMain::slotClearInfoandFocus);
+
+#ifdef DTKWIDGET_CLASS_DSizeMode
+    // 紧凑模式信号处理
+    connect(DGuiApplicationHelper::instance(), &DGuiApplicationHelper::sizeModeChanged, this, &LogCollectorMain::updateSizeMode);
+    updateSizeMode();
+#endif
 }
 
 void LogCollectorMain::slotClearInfoandFocus()
@@ -441,6 +450,26 @@ void LogCollectorMain::slotClearInfoandFocus()
     }
 }
 
+void LogCollectorMain::updateSizeMode()
+{
+    int nBtnSize = BUTTON_SIZE;
+#ifdef DTKWIDGET_CLASS_DSizeMode
+    if (DGuiApplicationHelper::isCompactMode())
+        nBtnSize = BUTTON_SIZE_COMPACT;
+    else
+        nBtnSize = BUTTON_SIZE;
+#else
+    nBtnSize = BUTTON_SIZE;
+#endif
+
+    if (m_exportAllBtn) {
+        m_exportAllBtn->setFixedSize(QSize(nBtnSize, nBtnSize));
+    }
+    if (m_refreshBtn) {
+        m_refreshBtn->setFixedSize(QSize(nBtnSize, nBtnSize));
+    }
+}
+
 /**
  * @brief LogCollectorMain::initShortCut 初始化快捷键
  */

diff --git a/application/logcollectormain.h b/application/logcollectormain.h
@@ -49,6 +49,11 @@ public slots:
      */
     void slotClearInfoandFocus();
 
+private slots:
+    /**
+     * @brief 根据布局模式(紧凑)变更更新界面布局
+     */
+    void updateSizeMode();
 protected:
     void closeEvent(QCloseEvent *event);
 

diff --git a/application/loglistview.cpp b/application/loglistview.cpp
@@ -33,6 +33,7 @@
 #include <QShortcut>
 #include <QAbstractButton>
 #define ITEM_HEIGHT 40
+#define ITEM_HEIGHT_COMPACT 24
 #define ITEM_WIDTH 108
 #define ICON_SIZE 16
 
@@ -136,6 +137,12 @@ LogListView::LogListView(QWidget *parent)
     });
 
     connect(LogApplicationHelper::instance(), &LogApplicationHelper::sigValueChanged, this, &LogListView::slot_valueChanged_dConfig_or_gSetting);
+
+#ifdef DTKWIDGET_CLASS_DSizeMode
+    // 紧凑模式信号处理
+    connect(DGuiApplicationHelper::instance(), &DGuiApplicationHelper::sizeModeChanged, this, &LogListView::updateSizeMode);
+    updateSizeMode();
+#endif
 }
 
 /**
@@ -592,3 +599,24 @@ void LogListView::slot_valueChanged_dConfig_or_gSetting(const QString &key)
         }
     }
 }
+
+void LogListView::updateSizeMode()
+{
+    int nItemHeight = ITEM_HEIGHT;
+#ifdef DTKWIDGET_CLASS_DSizeMode
+    if (DGuiApplicationHelper::isCompactMode())
+        nItemHeight = ITEM_HEIGHT_COMPACT;
+    else
+        nItemHeight = ITEM_HEIGHT;
+#else
+    nItemHeight = ITEM_HEIGHT;
+#endif
+
+    if (m_pModel) {
+        int nCount = m_pModel->rowCount();
+        for (int i = 0; i < nCount; i++) {
+            QStandardItem* item = m_pModel->item(i);
+            item->setSizeHint(QSize(ITEM_WIDTH, nItemHeight));
+        }
+    }
+}
diff --git a/application/loglistview.h b/application/loglistview.h
@@ -47,6 +47,11 @@ public slots:
     void requestshowRightMenu(const QPoint &pos);
     void slot_valueChanged_dConfig_or_gSetting(const QString &key);
 
+private slots:
+    /**
+     * @brief 根据布局模式(紧凑)变更更新界面布局
+     */
+    void updateSizeMode();
 protected:
     void paintEvent(QPaintEvent *event) override;
     void currentChanged(const QModelIndex &current, const QModelIndex &previous) override;

diff --git a/application/logviewheaderview.cpp b/application/logviewheaderview.cpp
@@ -16,6 +16,8 @@
 #include <DStyle>
 
 static const int kSpacingMargin = 4;
+#define ROW_HEIGHT 36
+#define ROW_HEIGHT_COMPACT 24
 
 LogViewHeaderView::LogViewHeaderView(Qt::Orientation orientation, QWidget *parent)
     : DHeaderView(orientation, parent)
@@ -27,6 +29,12 @@ LogViewHeaderView::LogViewHeaderView(Qt::Orientation orientation, QWidget *paren
     setDefaultAlignment(Qt::AlignLeft | Qt::AlignVCenter);
     setFixedHeight(37);
     setFocusPolicy(Qt::NoFocus);
+
+#ifdef DTKWIDGET_CLASS_DSizeMode
+    // 紧凑模式信号处理
+    connect(DGuiApplicationHelper::instance(), &DGuiApplicationHelper::sizeModeChanged, this, &LogViewHeaderView::updateSizeMode);
+    updateSizeMode();
+#endif
 }
 
 LogViewHeaderView::~LogViewHeaderView()
@@ -191,7 +199,16 @@ void LogViewHeaderView::paintEvent(QPaintEvent *event)
 
 QSize LogViewHeaderView::sizeHint() const
 {
-    return QSize(width(), 36 + m_spacing);
+    int nRowHeight = ROW_HEIGHT;
+#ifdef DTKWIDGET_CLASS_DSizeMode
+    if (DGuiApplicationHelper::isCompactMode())
+        nRowHeight = ROW_HEIGHT_COMPACT;
+    else
+        nRowHeight = ROW_HEIGHT;
+#else
+    nRowHeight = ROW_HEIGHT;
+#endif
+    return QSize(width(), nRowHeight + m_spacing);
 }
 /**
  * @brief LogViewHeaderView::sectionSizeHint 根据是否有排序箭头返回逻辑字段合适的尺寸
@@ -216,3 +233,17 @@ int LogViewHeaderView::sectionSizeHint(int logicalIndex) const
         return fm.width(buf) + margin * 2;
     }
 }
+
+void LogViewHeaderView::updateSizeMode()
+{
+    int nRowHeight = ROW_HEIGHT;
+#ifdef DTKWIDGET_CLASS_DSizeMode
+    if (DGuiApplicationHelper::isCompactMode())
+        nRowHeight = ROW_HEIGHT_COMPACT;
+    else
+        nRowHeight = ROW_HEIGHT;
+#else
+    nRowHeight = ROW_HEIGHT;
+#endif
+    setFixedHeight(nRowHeight);
+}
diff --git a/application/logviewheaderview.h b/application/logviewheaderview.h
@@ -24,6 +24,11 @@ class LogViewHeaderView : public DHeaderView
     inline int getSpacing() const { return m_spacing; }
     inline void setSpacing(int spacing) { m_spacing = spacing; }
 
+private slots:
+    /**
+     * @brief 根据布局模式(紧凑)变更更新界面布局
+     */
+    void updateSizeMode();
 protected:
     void paintEvent(QPaintEvent *e) override;
     virtual void paintSection(QPainter *painter, const QRect &rect,

diff --git a/application/logviewitemdelegate.cpp b/application/logviewitemdelegate.cpp
@@ -21,6 +21,9 @@ DWIDGET_USE_NAMESPACE
 #define ICON_WIDTH 24
 #define ICON_HEIGHT 24
 
+#define ROW_HEIGHT 36
+#define ROW_HEIGHT_COMPACT 24
+
 LogViewItemDelegate::LogViewItemDelegate(QObject *parent)
     : QStyledItemDelegate(parent)
 {
@@ -121,7 +124,16 @@ QSize LogViewItemDelegate::sizeHint(const QStyleOptionViewItem &option,
                                     const QModelIndex &index) const
 {
     QSize size = QStyledItemDelegate::sizeHint(option, index);
-    size.setHeight(36);
+    int nRowHeight = ROW_HEIGHT;
+#ifdef DTKWIDGET_CLASS_DSizeMode
+    if (DGuiApplicationHelper::isCompactMode())
+        nRowHeight = ROW_HEIGHT_COMPACT;
+    else
+        nRowHeight = ROW_HEIGHT;
+#else
+    nRowHeight = ROW_HEIGHT;
+#endif
+    size.setHeight(nRowHeight);
     return size;
 }
 /**