Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-04 09:23:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: 高效模式下最右侧增加显示桌面区域

Browse Source 
高效模式最右侧增加显示桌面区域

Log: 增加显示桌面按钮
Influence: 进入高效模式，鼠标进入最右侧，点击，观察是否可以正常显示桌面
Bug: https://pms.uniontech.com/bug-view-180859.html
Change-Id: I1565d0ad5a47bb3f99c9d51c74c6df67f7f7892c
This commit is contained in:
donghualin 2023-01-09 19:18:05 +08:00
parent 60e5e1b749
commit 4ed9b915f9
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
frame/window/docktraywindow.cpp
View File

@ -29,6 +29,7 @@
#include "pluginsitem.h" #include "pluginsitem.h"
#include "expandiconwidget.h" #include "expandiconwidget.h"
#include "quickdragcore.h" #include "quickdragcore.h"
#include "desktop_widget.h"
#include <DGuiApplicationHelper> #include <DGuiApplicationHelper>
@ -45,7 +46,7 @@ DockTrayWindow::DockTrayWindow(DockInter *dockInter, QWidget *parent)
, m_position(Dock::Position::Bottom) , m_position(Dock::Position::Bottom)
, m_displayMode(Dock::DisplayMode::Efficient) , m_displayMode(Dock::DisplayMode::Efficient)
, m_mainBoxLayout(new QBoxLayout(QBoxLayout::Direction::RightToLeft, this)) , m_mainBoxLayout(new QBoxLayout(QBoxLayout::Direction::RightToLeft, this))
, m_frontWidget(new QWidget(this)) , m_showDesktopWidget(new DesktopWidget(this))
, m_toolWidget(new QWidget(this)) , m_toolWidget(new QWidget(this))
, m_toolLayout(new QBoxLayout(QBoxLayout::RightToLeft, m_toolWidget)) , m_toolLayout(new QBoxLayout(QBoxLayout::RightToLeft, m_toolWidget))
, m_toolLineLabel(new QLabel(this)) , m_toolLineLabel(new QLabel(this))
@ -280,7 +281,7 @@ void DockTrayWindow::updateToolWidget()
{ {
m_toolWidget->setVisible(m_toolLayout->count() > 0); m_toolWidget->setVisible(m_toolLayout->count() > 0);
m_toolLineLabel->setVisible(m_toolLayout->count() > 0); m_toolLineLabel->setVisible(m_toolLayout->count() > 0);
m_frontWidget->setVisible(m_toolLayout->count() > 0); m_showDesktopWidget->setVisible(m_toolLayout->count() > 0);
} }
void DockTrayWindow::initUi() void DockTrayWindow::initUi()
@ -291,7 +292,7 @@ void DockTrayWindow::initUi()
m_systemPuginWidget->setDisplayMode(Dock::DisplayMode::Efficient); m_systemPuginWidget->setDisplayMode(Dock::DisplayMode::Efficient);
m_mainBoxLayout->setContentsMargins(0, 0, 0, 0); m_mainBoxLayout->setContentsMargins(0, 0, 0, 0);
m_mainBoxLayout->setSpacing(0); m_mainBoxLayout->setSpacing(0);
m_mainBoxLayout->addWidget(m_frontWidget); m_mainBoxLayout->addWidget(m_showDesktopWidget);
m_mainBoxLayout->addWidget(m_toolWidget); m_mainBoxLayout->addWidget(m_toolWidget);
m_mainBoxLayout->addSpacing(SPLITESPACE); m_mainBoxLayout->addSpacing(SPLITESPACE);
m_mainBoxLayout->addWidget(m_toolLineLabel); m_mainBoxLayout->addWidget(m_toolLineLabel);
@ -363,7 +364,7 @@ void DockTrayWindow::onUpdateComponentSize()
case Dock::Position::Left: case Dock::Position::Left:
case Dock::Position::Right: case Dock::Position::Right:
m_toolLineLabel->setFixedSize(width() * 0.6, SPLITERSIZE); m_toolLineLabel->setFixedSize(width() * 0.6, SPLITERSIZE);
m_frontWidget->setFixedSize(QWIDGETSIZE_MAX, FRONTSPACING); m_showDesktopWidget->setFixedSize(QWIDGETSIZE_MAX, FRONTSPACING);
m_dateTimeWidget->setFixedSize(QWIDGETSIZE_MAX, m_dateTimeWidget->suitableSize().height()); m_dateTimeWidget->setFixedSize(QWIDGETSIZE_MAX, m_dateTimeWidget->suitableSize().height());
m_systemPuginWidget->setFixedSize(QWIDGETSIZE_MAX, m_systemPuginWidget->suitableSize().height()); m_systemPuginWidget->setFixedSize(QWIDGETSIZE_MAX, m_systemPuginWidget->suitableSize().height());
m_quickIconWidget->setFixedSize(QWIDGETSIZE_MAX, m_quickIconWidget->suitableSize().height()); m_quickIconWidget->setFixedSize(QWIDGETSIZE_MAX, m_quickIconWidget->suitableSize().height());
@ -372,7 +373,7 @@ void DockTrayWindow::onUpdateComponentSize()
case Dock::Position::Top: case Dock::Position::Top:
case Dock::Position::Bottom: case Dock::Position::Bottom:
m_toolLineLabel->setFixedSize(SPLITERSIZE, height() * 0.6); m_toolLineLabel->setFixedSize(SPLITERSIZE, height() * 0.6);
m_frontWidget->setFixedSize(FRONTSPACING, QWIDGETSIZE_MAX); m_showDesktopWidget->setFixedSize(FRONTSPACING, QWIDGETSIZE_MAX);
m_dateTimeWidget->setFixedSize(m_dateTimeWidget->suitableSize().width(), QWIDGETSIZE_MAX); m_dateTimeWidget->setFixedSize(m_dateTimeWidget->suitableSize().width(), QWIDGETSIZE_MAX);
m_systemPuginWidget->setFixedSize(m_systemPuginWidget->suitableSize().width(), QWIDGETSIZE_MAX); m_systemPuginWidget->setFixedSize(m_systemPuginWidget->suitableSize().width(), QWIDGETSIZE_MAX);
m_quickIconWidget->setFixedSize(m_quickIconWidget->suitableSize().width(), QWIDGETSIZE_MAX); m_quickIconWidget->setFixedSize(m_quickIconWidget->suitableSize().width(), QWIDGETSIZE_MAX);

2
frame/window/docktraywindow.h
View File

@ -81,7 +81,7 @@ private:
Dock::Position m_position; Dock::Position m_position;
Dock::DisplayMode m_displayMode; Dock::DisplayMode m_displayMode;
QBoxLayout *m_mainBoxLayout; QBoxLayout *m_mainBoxLayout;
QWidget *m_frontWidget; QWidget *m_showDesktopWidget;
QWidget *m_toolWidget; QWidget *m_toolWidget;
QBoxLayout *m_toolLayout; QBoxLayout *m_toolLayout;
QLabel *m_toolLineLabel; QLabel *m_toolLineLabel;