From 91d314a88834216d296a9c83515b220dc10a53c3 Mon Sep 17 00:00:00 2001 From: sleepwithoutbz Date: Sat, 20 Sep 2025 12:30:37 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E4=BA=86=E9=83=A8?= =?UTF-8?q?=E5=88=86=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ElaWidgetTools/CMakeLists.txt | 2 +- .../DeveloperComponents/ElaCentralStackedWidget.cpp | 1 + ElaWidgetTools/ElaNavigationBar.cpp | 5 +++-- ElaWidgetTools/private/ElaNavigationBarPrivate.cpp | 1 + ElaWidgetTools/private/ElaWindowPrivate.cpp | 1 + src/window.cpp | 3 ++- 6 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ElaWidgetTools/CMakeLists.txt b/ElaWidgetTools/CMakeLists.txt index 7a3af65..2b05197 100644 --- a/ElaWidgetTools/CMakeLists.txt +++ b/ElaWidgetTools/CMakeLists.txt @@ -17,7 +17,7 @@ set(PROJECT_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/ElaWidgetTools.qrc ) -option(ELAWIDGETTOOLS_BUILD_STATIC_LIB "Build static library." OFF) +option(ELAWIDGETTOOLS_BUILD_STATIC_LIB "Build static library." ON) if (ELAWIDGETTOOLS_BUILD_STATIC_LIB) set(LIB_TYPE "STATIC") diff --git a/ElaWidgetTools/DeveloperComponents/ElaCentralStackedWidget.cpp b/ElaWidgetTools/DeveloperComponents/ElaCentralStackedWidget.cpp index e5b0551..cfdd5ca 100644 --- a/ElaWidgetTools/DeveloperComponents/ElaCentralStackedWidget.cpp +++ b/ElaWidgetTools/DeveloperComponents/ElaCentralStackedWidget.cpp @@ -168,6 +168,7 @@ void ElaCentralStackedWidget::doWindowStackSwitch(ElaWindowType::StackSwitchMode void ElaCentralStackedWidget::paintEvent(QPaintEvent *event) { QRect targetRect = this->rect(); + // ADDZY: 左上角向右下移动(1, 1),右下角向右下收缩(10, 10) targetRect.adjust(1, 1, 10, 10); QPainter painter(this); painter.save(); diff --git a/ElaWidgetTools/ElaNavigationBar.cpp b/ElaWidgetTools/ElaNavigationBar.cpp index dd17069..3df280c 100644 --- a/ElaWidgetTools/ElaNavigationBar.cpp +++ b/ElaWidgetTools/ElaNavigationBar.cpp @@ -56,13 +56,14 @@ ElaNavigationBar::ElaNavigationBar(QWidget *parent) : QWidget{parent}, d_ptr(new userCardLayout->addLayout(d->_userButtonLayout); userCardLayout->addWidget(d->_userCard); - // 搜索栏和按钮组 + // ADDZY: 导航栏展开收缩按钮 d->_navigationButton = new ElaToolButton(this); d->_navigationButton->setFixedSize(40, 38); d->_navigationButton->setElaIcon(ElaIconType::Bars); d->_navigationButton->setBorderRadius(8); connect(d->_navigationButton, &ElaToolButton::clicked, d, &ElaNavigationBarPrivate::onNavigationButtonClicked); + // 搜索栏 d->_searchButton = new ElaToolButton(this); d->_searchButton->setFixedSize(40, 38); d->_searchButton->setElaIcon(ElaIconType::MagnifyingGlass); @@ -433,7 +434,7 @@ void ElaNavigationBar::navigation(QString pageKey, bool isLogClicked, bool isRou } } } - +// 调整导航栏样式的函数 void ElaNavigationBar::setDisplayMode(ElaNavigationType::NavigationDisplayMode displayMode, bool isAnimation) { Q_D(ElaNavigationBar); if (d->_currentDisplayMode == displayMode || displayMode == ElaNavigationType::Auto) { diff --git a/ElaWidgetTools/private/ElaNavigationBarPrivate.cpp b/ElaWidgetTools/private/ElaNavigationBarPrivate.cpp index d01af96..4d846d4 100644 --- a/ElaWidgetTools/private/ElaNavigationBarPrivate.cpp +++ b/ElaWidgetTools/private/ElaNavigationBarPrivate.cpp @@ -25,6 +25,7 @@ ElaNavigationBarPrivate::ElaNavigationBarPrivate(QObject *parent) : QObject{pare ElaNavigationBarPrivate::~ElaNavigationBarPrivate() {} +// ADDZY: 导航栏内部展开收缩按钮被点击 void ElaNavigationBarPrivate::onNavigationButtonClicked() { Q_Q(ElaNavigationBar); if (_currentDisplayMode == ElaNavigationType::Compact) { diff --git a/ElaWidgetTools/private/ElaWindowPrivate.cpp b/ElaWidgetTools/private/ElaWindowPrivate.cpp index 02bd8ff..bf14a95 100644 --- a/ElaWidgetTools/private/ElaWindowPrivate.cpp +++ b/ElaWidgetTools/private/ElaWindowPrivate.cpp @@ -16,6 +16,7 @@ ElaWindowPrivate::ElaWindowPrivate(QObject *parent) : QObject{parent} {} ElaWindowPrivate::~ElaWindowPrivate() {} +// 隐藏/显示导航栏的槽函数 void ElaWindowPrivate::onNavigationButtonClicked() { if (_isWMClickedAnimationFinished) { _isNavigationDisplayModeChanged = false; diff --git a/src/window.cpp b/src/window.cpp index c3d0ab8..abea1e5 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -30,7 +30,8 @@ MainWindow::~MainWindow() {} void MainWindow::initWindow() { qDebug() << "Window: Init the window."; qDebug() << "Window: Set to fixed size"; - setIsFixedSize(true); + // setIsFixedSize(true); // TODO: Set the subtitle of user info card setUserInfoCardSubTitle("Nothing!"); + // resize(600,480); }