Merge pull request !16 from hyter/openkylin/yangtze
This commit is contained in:
何朴尧 2023-04-10 05:35:15 +00:00 committed by Gitee
commit 4c2f75b0aa
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 26 additions and 8 deletions

20
debian/changelog vendored
View File

@ -1,8 +1,26 @@
ukui-power-manager (3.1.1.3-ok24) yangtze; urgency=medium
* close-cd #I64KQX 【次要】【电源管理】点击任务栏电源图标,弹窗位置出错
-- hanhongliang <hanhongliang@kylinos.cn> Mon, 03 Apr 2023 16:19:04 +0800
ukui-power-manager (3.1.1.3-ok23) yangtze; urgency=medium
* close-cd #I5VKDS 【电源管理】【任务栏】电源管理窗口左上、右上两个角不是圆角
-- hanhongliang <hanhongliang@kylinos.cn> Mon, 03 Apr 2023 14:11:18 +0800
ukui-power-manager (3.1.1.3-ok22) yangtze; urgency=medium
* close-cd #I5XLZB 【UKUI需求 需求14099】【电源管理】插拔电源有通知预期为无通知
-- hanhongliang <hanhongliang@kylinos.cn> Mon, 03 Apr 2023 14:06:09 +0800
ukui-power-manager (3.1.1.3-ok21) yangtze; urgency=medium
* close-cd #I64FWN【主要】【电源管理】未连接电源登录提示系统进入低电量状态实际电量90%
-- 韩鸿亮 <hanhongliang@hanhongliang.kylinos.cn> Wed, 01 Mar 2023 15:28:05 +0800
-- hanhongliang <hanhongliang@kylinos.cn> Wed, 01 Mar 2023 15:28:05 +0800
ukui-power-manager (3.1.1.3-ok20) yangtze; urgency=medium

View File

@ -129,7 +129,7 @@ void PowerTray::onActivatedIcon(QSystemTrayIcon::ActivationReason reason)
powerWindow->setSliderValue();
powerWindow->set_window_position();
KWindowSystem::setState(powerWindow->winId(), NET::SkipTaskbar | NET::SkipPager);
powerWindow->show();
// powerWindow->show();
}
}

View File

@ -382,13 +382,13 @@ void powerwindow::criticalBatteryNotify() {}
void powerwindow::set_window_position()
{
this->setWindowFlag(Qt::FramelessWindowHint);
// this->setWindowFlag(Qt::FramelessWindowHint);
kdk::UkuiStyleHelper::self()->removeHeader(this);
if (this->isVisible()) {
this->show();
} else {
this->hide();
}
this->hide();
} else {
this->show();
}
QRect rect;
QDBusInterface iface("org.ukui.panel", "/panel/position", "org.ukui.panel", QDBusConnection::sessionBus());
QDBusReply<QVariantList> reply = iface.call("GetPrimaryScreenGeometry");

View File

@ -205,7 +205,7 @@ void PowerManagerCenter::dealPowerStateChanged(bool state)
void PowerManagerCenter::dealBatteryStateChanged(int state)
{
qDebug() << "battery state:" << state;
m_notification->batteryStateMsgNotify(state);
// m_notification->batteryStateMsgNotify(state);
}
void PowerManagerCenter::dealLowBatteryChanged(const int &state)