Skip to content

Commit

Permalink
fix: 修复 dde-shell 样式 (#506)
Browse files Browse the repository at this point in the history 
* 使用 layout 和 widget 替代手动绘制
* 大小自适应
* 适配 dde-tray-loader

Issues: linuxdeepin/developer-center#9820
  • Loading branch information
@zsien
zsien authored Jul 24, 2024
1 parent a0167c5 commit d07f0f4
Show file tree
Hide file tree
Showing 2 changed files with 59 additions and 176 deletions.
203 changes: 54 additions & 149 deletions src/dde-dock-plugins/recordtime/timewidget.cpp
100755 → 100644
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include "timewidget.h"
#include "dde-dock/constants.h"

#include <DFontSizeManager>
#include <DGuiApplicationHelper>
#include <DStyle>
#include <DSysInfo>
Expand All @@ -24,8 +25,14 @@
#include <fcntl.h>
#include <unistd.h>
#include <iostream>

DCORE_USE_NAMESPACE

#define RECORDER_TIME_LEVEL_ICON_SIZE 23
#define RECORDER_TIME_VERTICAL_ICON_SIZE 16
#define RECORDER_TIME_FONT DFontSizeManager::instance()->t8()
#define RECORDER_PADDING 1

TimeWidget::TimeWidget(DWidget *parent):
DWidget(parent),
m_timer(nullptr),
Expand All @@ -34,17 +41,29 @@ TimeWidget::TimeWidget(DWidget *parent):
m_shadeIcon(nullptr),
m_currentIcon(nullptr),
m_bRefresh(true),
m_position(-1),
m_position(Dock::Position::Bottom),
m_hover(false),
m_pressed(false),
m_systemVersion(0)
{
m_systemVersion = DSysInfo::minorVersion().toInt() ;
qInfo() << "Current system version: " << m_systemVersion;
qInfo() << "正在初始化计时显示界面...";
QFontMetrics fm(RECORDER_TIME_FONT);
m_showTimeStr = QString("00:00:00");
m_textSize = fm.boundingRect("00:00:00 ").size();
setContentsMargins(0, 0, 0, 0);

auto *layout = new QHBoxLayout(this);
setLayout(layout);
layout->setSizeConstraint(QLayout::SetFixedSize);

m_iconLabel = new QLabel(this);
m_textLabel = new QLabel(this);
layout->addWidget(m_iconLabel);
layout->addWidget(m_textLabel);

m_textLabel->setFont(RECORDER_TIME_FONT);
m_textLabel->setText("00:00:00");
QPalette textPalette = m_textLabel->palette();
textPalette.setColor(QPalette::WindowText, Qt::white);
m_textLabel->setPalette(textPalette);
m_textLabel->setAlignment(Qt::AlignRight | Qt::AlignVCenter);

m_timer = new QTimer(this);
m_dockInter = new DBusDock("com.deepin.dde.daemon.Dock", "/com/deepin/dde/daemon/Dock", QDBusConnection::sessionBus(), this);
connect(m_dockInter, &DBusDock::PositionChanged, this, &TimeWidget::onPositionChanged);
Expand All @@ -61,12 +80,10 @@ TimeWidget::TimeWidget(DWidget *parent):
}

m_currentIcon = m_lightIcon;
setMaximumSize(RECORDER_TIME_WIDGET_MAXWIDTH,RECORDER_TIME_WIDGET_MAXHEIGHT);
if (position::left == m_position || position::right == m_position) {
setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Maximum);
}else {
setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
}

updateIcon();

setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);

}

Expand Down Expand Up @@ -95,41 +112,6 @@ bool TimeWidget::enabled()
return isEnabled();
}

QSize TimeWidget::sizeHint() const
{
qInfo() << "================ sizeHint ==start============== ";
//qInfo() << "sizeHint 1>>>>>>>>>> this->width(): " << this->width() << " , this->height(): " << this->height();
//qInfo() << "sizeHint 1>>>>>>>>>> this->geometry(): " << this->geometry();
QFontMetrics fm(RECORDER_TIME_FONT);
int width = -1;
int height = -1;
if (position::top == m_position || position::bottom == m_position) {
width = fm.boundingRect(RECORDER_TIME_LEVEL_SIZE).size().width() + 5 + RECORDER_TIME_LEVEL_ICON_SIZE + RECORDER_TEXT_TOP_BOTTOM_X;
if(m_systemVersion >= 1070){
width = fm.boundingRect(RECORDER_TIME_LEVEL_SIZE).size().width() + 5 + RECORDER_TIME_VERTICAL_ICON_SIZE;
}
height = this->height();
qInfo() << "top or bottom itemWidget width: " << width << " ,itemWidget height: " << height;
} else if (position::left == m_position || position::right == m_position) {
if(this->width() > RECORDER_TIME_WIDGET_MAXHEIGHT){
width = RECORDER_TIME_WIDGET_MAXHEIGHT;
height = width;
}else{
width = this->width();
height = width;
}
if(m_systemVersion >= 1070){
width = RECORDER_TIME_VERTICAL_ICON_SIZE_1070;
height = width;
}
qInfo() << "left or right itemWidget width: " << width << " ,itemWidget height: " << height;
}
//qInfo() << "sizeHint 2>>>>>>>>>> this->width(): " << this->width() << " , this->height(): " << this->height();
//qInfo() << "sizeHint 2>>>>>>>>>> this->geometry(): " << this->geometry();
qInfo() << "================ sizeHint ==end============== ";
return QSize(width, height);
}

void TimeWidget::onTimeout()
{
if (m_bRefresh) {
Expand All @@ -142,27 +124,32 @@ void TimeWidget::onTimeout()
QTime showTime(0, 0, 0);
int time = m_baseTime.secsTo(QTime::currentTime());
showTime = showTime.addSecs(time);
m_showTimeStr = showTime.toString("hh:mm:ss");
update();
m_textLabel->setText(showTime.toString("hh:mm:ss"));
updateIcon();
}

void TimeWidget::updateIcon() {
if (Dock::Position::Top == m_position || Dock::Position::Bottom == m_position) {
m_pixmap = QIcon::fromTheme(QString("recordertime"), *m_currentIcon).pixmap(QSize(RECORDER_TIME_LEVEL_ICON_SIZE, RECORDER_TIME_LEVEL_ICON_SIZE));
} else {
m_pixmap = QIcon::fromTheme(QString("recordertime"), *m_currentIcon).pixmap(QSize(RECORDER_TIME_VERTICAL_ICON_SIZE, RECORDER_TIME_VERTICAL_ICON_SIZE));
}

m_iconLabel->setPixmap(m_pixmap);
}

void TimeWidget::onPositionChanged(int value)
{
qInfo() << "====================== onPositionChanged ====start=================";
m_position = value;
if (position::left == m_position || position::right == m_position) {
setGeometry(this->geometry().x(), this->geometry().y(), this->geometry().width(), RECORDER_TIME_VERTICAL_ICON_SIZE);
updateGeometry();
setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
}else {
setGeometry(this->geometry().x(),this->geometry().y(),this->geometry().width(),RECORDER_TIME_WIDGET_MAXHEIGHT);
updateGeometry();
setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);

if (m_position == Dock::Position::Top || m_position == Dock::Position::Bottom) {
m_textLabel->show();
} else {
m_textLabel->hide();
}
//qInfo() << ">>>>>>>>>> this->width(): " << this->width() << " , this->height(): " << this->height();
//qInfo() << ">>>>>>>>>> this->geometry(): " << this->geometry();
qInfo() << "====================== onPositionChanged ====end=================";

qInfo() << "====================== onPositionChanged ====end=================";
}

void TimeWidget::paintEvent(QPaintEvent *e)
Expand Down Expand Up @@ -196,89 +183,18 @@ void TimeWidget::paintEvent(QPaintEvent *e)
painter.setOpacity(0.05);
}
}
painter.setPen(Qt::white);
painter.setRenderHint(QPainter::Antialiasing, true);
DStyleHelper dstyle(style());
const int radius = dstyle.pixelMetric(DStyle::PM_FrameRadius);
QPainterPath path;
if(m_systemVersion < 1070){
if (position::top == m_position || position::bottom == m_position) {
QRect rc(0, 0, rect().width(), rect().height());
rc.moveTo(rect().center() - rc.center());
path.addRoundedRect(rc, radius, radius);

} else if (position::right == m_position || position::left == m_position) {
if (rect().width() > RECORDER_TIME_LEVEL_ICON_SIZE) {
int minSize = std::min(width(), height());
QRect rc(0, 0, minSize, minSize);
rc.moveTo(rect().center() - rc.center());
path.addRoundedRect(rc, radius, radius);
} else {
painter.setPen(Qt::black);
}
}
}else{
if (DGuiApplicationHelper::instance()->themeType() == DGuiApplicationHelper::LightType) {
painter.setPen(Qt::black);
} else {
painter.setPen(Qt::white);
}
if ((Dock::Position::Top == m_position || Dock::Position::Bottom == m_position) ||
((Dock::Position::Right == m_position || Dock::Position::Left == m_position) && rect().width() > RECORDER_TIME_LEVEL_ICON_SIZE)) {
QRect rc(RECORDER_PADDING, RECORDER_PADDING, rect().width() - RECORDER_PADDING * 2, rect().height() - RECORDER_PADDING * 2);
path.addRoundedRect(rc, radius, radius);
}
painter.fillPath(path, color);
} else {
if (DGuiApplicationHelper::instance()->themeType() == DGuiApplicationHelper::LightType) {
painter.setPen(Qt::black);
} else {
painter.setPen(Qt::white);
}
//painter.setPen(Qt::black);
}
painter.setOpacity(1);
painter.setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform, true);
const auto ratio = devicePixelRatioF();
QSize size = QSize(RECORDER_TIME_VERTICAL_ICON_SIZE, RECORDER_TIME_VERTICAL_ICON_SIZE);
if(m_systemVersion >= 1070){
size = QSize(RECORDER_TIME_VERTICAL_ICON_SIZE_1070, RECORDER_TIME_VERTICAL_ICON_SIZE_1070);
}
auto pixmapSize = QCoreApplication::testAttribute(Qt::AA_UseHighDpiPixmaps) ? size : (size * ratio);

//判断任务栏在屏幕上的位置,上下左右
if (position::top == m_position || position::bottom == m_position) {
m_pixmap = QIcon::fromTheme(QString("recordertime"), *m_currentIcon).pixmap(size);
//m_pixmap.setDevicePixelRatio(ratio);
const QRectF &rf = QRectF(rect());
qDebug() << ">>>>>>> rf: " << rf << rf.center();
const QRectF &prf = QRectF(m_pixmap.rect().x(), m_pixmap.rect().y(), m_pixmap.rect().width() / ratio, m_pixmap.rect().height() / ratio);
qDebug() << ">>>>>>> prf: " << prf << prf.center();
QPointF pf = rf.center() - prf.center();
//qDebug() << ">>>>>>> pf: " << pf ;
//绘制录像小图标
QPointF pff = QPointF(5, pf.y());
if(m_systemVersion >= 1070){
pff = QPointF(0, pf.y());
}
//qDebug() << ">>>>>>> pff: " << pff ;
painter.drawPixmap(pff, m_pixmap);
QFont font = RECORDER_TIME_FONT;
painter.setFont(font);
QFontMetrics fm(font);
// painter.drawText(m_pixmap.width() * static_cast<int>(ratio) + RECORDER_TEXT_TOP_BOTTOM_X + RECORDER_ICON_TOP_BOTTOM_X, rect().y(), rect().width(), rect().height(), Qt::AlignLeft | Qt::AlignVCenter, m_showTimeStr);
int tx = static_cast<int>(m_pixmap.width() / ratio) + RECORDER_TEXT_TOP_BOTTOM_X;
int ty = rect().y()-1;
int twidth = rect().width();
int theight = rect().height();
//绘制时间
painter.drawText(tx, ty, twidth, theight, Qt::AlignLeft | Qt::AlignVCenter, m_showTimeStr);
} else if (position::right == m_position || position::left == m_position) {
m_pixmap = QIcon::fromTheme(QString("recordertime"), *m_currentIcon).pixmap(pixmapSize);
//m_pixmap.setDevicePixelRatio(ratio);
const QRectF &rf = QRectF(rect());
const QRectF &rfp = QRectF(m_pixmap.rect());
//qInfo() << __FUNCTION__ << " >>>>>>>>>> rfp: " << rfp << " , rf: " << rf;
painter.drawPixmap(rf.center() - rfp.center() / m_pixmap.devicePixelRatioF(), m_pixmap);
}
//qInfo() << __FUNCTION__ << " >>>>>>>>>> this->width(): " << this->width() << " , this->height(): " << this->height();
//qInfo() << __FUNCTION__ << " >>>>>>>>>> this->geometry(): " << this->geometry();

QWidget::paintEvent(e);
//qInfo() << "====================== paintEvent ====end=================";
}
Expand Down Expand Up @@ -350,17 +266,7 @@ void TimeWidget::mouseReleaseEvent(QMouseEvent *e)
QWidget::mouseReleaseEvent(e);
return;
}
int width = 0;
if(m_systemVersion >= 1070){
width = rect().width();
}else{
//任务栏的位置在桌面顶部和底部时才会显示录屏时间
if (position::top == m_position || position::bottom == m_position) {
width = rect().width();
} else {
width = m_pixmap.width();
}
}
int width = rect().width();
bool flag = true;
if (e->pos().x() > 0 && e->pos().x() < width) {
#if defined (__mips__) || defined (__sw_64__) || defined (__loongarch_64__) || defined (__aarch64__) || defined (__loongarch__)
Expand Down Expand Up @@ -407,7 +313,6 @@ void TimeWidget::leaveEvent(QEvent *e)

void TimeWidget::start()
{
m_showTimeStr = QString("00:00:00");
connect(m_timer, SIGNAL(timeout()), this, SLOT(onTimeout()));
m_baseTime = QTime::currentTime();
m_timer->start(400);
Expand Down
32 changes: 5 additions & 27 deletions src/dde-dock-plugins/recordtime/timewidget.h
100755 → 100644
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,31 +15,13 @@
#include <QBoxLayout>
#include <QLabel>

#define RECORDER_TIME_LEVEL_ICON_SIZE 23
#define RECORDER_TIME_VERTICAL_ICON_SIZE 22
#define RECORDER_TIME_VERTICAL_ICON_SIZE_1070 16
#define RECORDER_TIME_LEVEL_SIZE "00:00:00"
#define RECORDER_TIME_VERTICAL_SIZE "0000"
#define RECORDER_TIME_FONT DFontSizeManager::instance()->t8()
#define RECORDER_ICON_TOP_BOTTOM_X 8
#define RECORDER_TEXT_TOP_BOTTOM_X 10
#define RECORDER_TIME_WIDGET_MAXHEIGHT 40
#define RECORDER_TIME_WIDGET_MAXWIDTH 120

DWIDGET_USE_NAMESPACE
using DBusDock = com::deepin::dde::daemon::Dock;

class TimeWidget : public DWidget
{
Q_OBJECT

enum position {
top = 0,
right,
bottom,
left
};

public:
explicit TimeWidget(DWidget *parent = nullptr);
~TimeWidget();
Expand All @@ -55,12 +37,6 @@ class TimeWidget : public DWidget
*/
void stop();

/**
* @brief sizeHint:返回控件大小
* @return
*/
QSize sizeHint() const override;

/**
* @brief 是否是wayland协议
* @return
Expand Down Expand Up @@ -90,19 +66,21 @@ private slots:
*/
void onPositionChanged(int value);

private:
void updateIcon();

private:
QTimer *m_timer;
DBusDock *m_dockInter;
QIcon *m_lightIcon;
QIcon *m_shadeIcon;
QIcon *m_currentIcon;
QLabel *m_iconLabel;
QLabel *m_textLabel;
QPixmap m_pixmap;
QSize m_textSize;
QTime m_baseTime;
QString m_showTimeStr;
bool m_bRefresh;
int m_position;
QBoxLayout *centralLayout;
bool m_hover;
bool m_pressed;
int m_systemVersion;
Expand Down

0 comments on commit d07f0f4

Please sign in to comment.