Skip to content

Commit 45d1a38

Browse files
committed
fix: The bug of hover window top failure
1 parent a6ad1ee commit 45d1a38

3 files changed

Lines changed: 7 additions & 1182 deletions

File tree

WinHoverNet.cpp

Lines changed: 7 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ WinHoverNet::WinHoverNet(Qt::Orientation orientation, QWidget *parent)
4848
, m_info(new MonitorInfo_x11())
4949
, m_timer(new QTimer())
5050
, m_modelUnit(Default)
51-
, m_precision(2)
51+
, m_precision(0)
5252
, m_orientation(orientation)
5353
, m_gridLayout(new QGridLayout(this))
5454
, m_vecLabel(8, nullptr)
@@ -65,8 +65,7 @@ WinHoverNet::WinHoverNet(Qt::Orientation orientation, QWidget *parent)
6565
WinHoverNet *WinHoverNet::getInstance()
6666
{
6767
static WinHoverNet instance;
68-
69-
qDebug()<<"--------------------->"<<&instance;
68+
// qDebug()<<"--------------------->"<<&instance;
7069
return &instance;
7170
}
7271

@@ -96,7 +95,7 @@ void WinHoverNet::init()
9695
m_info->netInfo(m_upload, m_down);
9796
m_info->cpuInfo(m_vec);
9897

99-
setSingleInstance(); // 注册 DBus
98+
// setSingleInstance(); // 注册 DBus
10099
}
101100

102101
void WinHoverNet::initSigConnect()
@@ -132,13 +131,6 @@ void WinHoverNet::initSigConnect()
132131
connect(m_winSetting, &WinSetting::sigShowModel, this, &WinHoverNet::onShowModel);
133132

134133
// connect(m_winSetting, &WinSetting::sigBtnApplyWinMain, this, &WinHoverNet::onBtnApplyWinMain);
135-
136-
137-
// connect(m_winSetting, &WinSetting::sigLabDiskReadText, this, &WinHoverNet::onLabDiskReadText);
138-
// connect(m_winSetting, &WinSetting::sigLabDiskWriteText, this, &WinHoverNet::onLabDiskWriteText);
139-
// connect(m_winSetting, &WinSetting::sigDisolayDisk, this, &WinHoverNet::onDisolayDisk);
140-
// connect(m_winSetting, &WinSetting::sigLocationExchangeDisk, this, &WinHoverNet::onLocationExchangeDisk);
141-
// connect(m_winSetting, &WinSetting::sigHoverDisplay, this, &WinHoverNet::onHoverDisplay);
142134
}
143135

144136
/*!
@@ -229,16 +221,6 @@ bool WinHoverNet::setSingleInstance()
229221
return false;
230222
}
231223

232-
//bool WinHoverNet::isHoverDisplay()
233-
//{
234-
// if (m_orientation == Qt::Horizontal)
235-
// return true;
236-
// else
237-
// return false;
238-
//}
239-
240-
241-
242224
/*!
243225
* \brief WinHoverNet::onNet 定时刷新网速
244226
*/
@@ -358,14 +340,15 @@ void WinHoverNet::onBackgroundImage(const QColor color)
358340

359341
/*!
360342
* \brief WinHoverNet::onWindowTop 设置窗口是否置顶
361-
* \param check true 置顶, false 不
343+
* \param check true 置顶, false
344+
* \see 参考:https://blog.csdn.net/GoForwardToStep/article/details/68938965
362345
*/
363346
void WinHoverNet::onWindowTop(bool check)
364347
{
365348
if (check) {
366-
setWindowFlags(windowFlags() | Qt::WindowStaysOnTopHint);
349+
setWindowFlags(Qt::FramelessWindowHint | Qt::WindowMinimizeButtonHint | Qt::WindowStaysOnTopHint);
367350
} else {
368-
setWindowFlags(windowFlags() | Qt::WindowMinimizeButtonHint); // 不是 Qt::WindowStaysOnBottomHint
351+
setWindowFlags(Qt::FramelessWindowHint | Qt::WindowMinimizeButtonHint); // 不是 Qt::WindowStaysOnBottomHint
369352
}
370353

371354
if (!isVisible()) // 当前窗口不可见,则显示出来

WinHoverNet.h.autosave

Lines changed: 0 additions & 90 deletions
This file was deleted.

0 commit comments

Comments
 (0)