update changelog
This commit is contained in:
parent
68e8a79d9e
commit
9d710ce106
|
@ -1,3 +1,11 @@
|
||||||
|
ukui-screensaver (4.0.0.0-ok3~0602) yangtze; urgency=medium
|
||||||
|
|
||||||
|
* BUG号:I73TLX 修复网络图标显示异常的问题
|
||||||
|
* 需求号:无
|
||||||
|
* 其他修改说明:无
|
||||||
|
|
||||||
|
-- Yang Min <yangmin@kylinos.cn> Fri, 02 Jun 2023 16:23:59 +0800
|
||||||
|
|
||||||
ukui-screensaver (4.0.0.0-ok2~0518) yangtze; urgency=medium
|
ukui-screensaver (4.0.0.0-ok2~0518) yangtze; urgency=medium
|
||||||
|
|
||||||
* BUG号:I72EWI锁屏界面点击切换用户回来后,输入框不输入文字时显示密码多了个冒号
|
* BUG号:I72EWI锁屏界面点击切换用户回来后,输入框不输入文字时显示密码多了个冒号
|
||||||
|
|
|
@ -0,0 +1,361 @@
|
||||||
|
From: winnerym <yangmin@kylinos.cn>
|
||||||
|
Date: Fri, 2 Jun 2023 16:26:26 +0800
|
||||||
|
Subject: update changelog
|
||||||
|
|
||||||
|
---
|
||||||
|
Common/CMakeLists.txt | 2 +-
|
||||||
|
Common/plasma-shell-manager.cpp | 4 ++
|
||||||
|
VirtualKeyboard/src/letterswidget.cpp | 2 +-
|
||||||
|
src/fullbackgroundwidget.cpp | 4 +-
|
||||||
|
src/lockwidget.cpp | 93 ++++++++++-------------------------
|
||||||
|
src/lockwidget.h | 2 +-
|
||||||
|
src/ukui-screensaver-dialog.cpp | 8 ++-
|
||||||
|
7 files changed, 37 insertions(+), 78 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/Common/CMakeLists.txt b/Common/CMakeLists.txt
|
||||||
|
index a53f577..1f4d3b7 100644
|
||||||
|
--- a/Common/CMakeLists.txt
|
||||||
|
+++ b/Common/CMakeLists.txt
|
||||||
|
@@ -28,4 +28,4 @@ set(Common_SRC
|
||||||
|
)
|
||||||
|
|
||||||
|
add_library(Common STATIC ${Common_SRC})
|
||||||
|
-target_link_libraries(Common Qt5::Core Qt5::DBus Qt5::Widgets ${GIOUNIX2_LIBRARIES} ${KF5Wayland_LIBRARIES} -lKF5WaylandClient -lKF5WaylandServer KF5::WindowSystem)
|
||||||
|
+target_link_libraries(Common Qt5::Core Qt5::DBus Qt5::Widgets Qt5::X11Extras ${GIOUNIX2_LIBRARIES} ${KF5Wayland_LIBRARIES} -lKF5WaylandClient -lKF5WaylandServer KF5::WindowSystem)
|
||||||
|
diff --git a/Common/plasma-shell-manager.cpp b/Common/plasma-shell-manager.cpp
|
||||||
|
index eeea7e4..e8336b4 100644
|
||||||
|
--- a/Common/plasma-shell-manager.cpp
|
||||||
|
+++ b/Common/plasma-shell-manager.cpp
|
||||||
|
@@ -19,6 +19,7 @@
|
||||||
|
#include "plasma-shell-manager.h"
|
||||||
|
|
||||||
|
#include <QApplication>
|
||||||
|
+#include <QX11Info>
|
||||||
|
|
||||||
|
#include <KWayland/Client/connection_thread.h>
|
||||||
|
#include <KWayland/Client/registry.h>
|
||||||
|
@@ -31,6 +32,9 @@ static PlasmaShellManager* global_instance = nullptr;
|
||||||
|
|
||||||
|
PlasmaShellManager *PlasmaShellManager::getInstance()
|
||||||
|
{
|
||||||
|
+ if(QString(qgetenv("XDG_SESSION_TYPE")) != "wayland" || QX11Info::isPlatformX11()){
|
||||||
|
+ return nullptr;
|
||||||
|
+ }
|
||||||
|
if (!global_instance)
|
||||||
|
{
|
||||||
|
global_instance = new PlasmaShellManager;
|
||||||
|
diff --git a/VirtualKeyboard/src/letterswidget.cpp b/VirtualKeyboard/src/letterswidget.cpp
|
||||||
|
index 102d64b..f93b522 100644
|
||||||
|
--- a/VirtualKeyboard/src/letterswidget.cpp
|
||||||
|
+++ b/VirtualKeyboard/src/letterswidget.cpp
|
||||||
|
@@ -28,7 +28,7 @@ LettersWidget::LettersWidget(QWidget *parent/* = nullptr*/)
|
||||||
|
this->setAttribute(Qt::WA_TranslucentBackground);//背景透明
|
||||||
|
initUI();
|
||||||
|
|
||||||
|
- if(QString(qgetenv("XDG_SESSION_TYPE")) == "wayland") {
|
||||||
|
+ if(QString(qgetenv("XDG_SESSION_TYPE")) == "wayland" && !QX11Info::isPlatformX11()) {
|
||||||
|
isWayland = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
diff --git a/src/fullbackgroundwidget.cpp b/src/fullbackgroundwidget.cpp
|
||||||
|
index 56e6d51..ae7695d 100644
|
||||||
|
--- a/src/fullbackgroundwidget.cpp
|
||||||
|
+++ b/src/fullbackgroundwidget.cpp
|
||||||
|
@@ -365,7 +365,7 @@ bool FullBackgroundWidget::eventFilter(QObject *obj, QEvent *event)
|
||||||
|
if(event->type() == QEvent::WindowDeactivate){
|
||||||
|
QTimer::singleShot(50,this,SLOT(laterActivate()));
|
||||||
|
}else if(event->type() == QEvent::WindowActivate){
|
||||||
|
- if(QString(qgetenv("XDG_SESSION_TYPE")) == "wayland") {
|
||||||
|
+ if(QString(qgetenv("XDG_SESSION_TYPE")) == "wayland" && !QX11Info::isPlatformX11()) {
|
||||||
|
PlasmaShellManager::getInstance()->setAppWindowKeepAbove(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -1222,7 +1222,7 @@ void FullBackgroundWidget::onDesktopResized()
|
||||||
|
update();
|
||||||
|
#endif
|
||||||
|
|
||||||
|
- if(QString(qgetenv("XDG_SESSION_TYPE")) == "wayland") {
|
||||||
|
+ if(QString(qgetenv("XDG_SESSION_TYPE")) == "wayland" && !QX11Info::isPlatformX11() ) {
|
||||||
|
PlasmaShellManager::getInstance()->setPos(this->windowHandle(),QPoint(0,0));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
diff --git a/src/lockwidget.cpp b/src/lockwidget.cpp
|
||||||
|
index daef32c..15ed1a1 100644
|
||||||
|
--- a/src/lockwidget.cpp
|
||||||
|
+++ b/src/lockwidget.cpp
|
||||||
|
@@ -60,6 +60,8 @@
|
||||||
|
#define KEY_PRIMARY_COLOR "primaryColor"
|
||||||
|
#define TIME_TYPE_SCHEMA "org.ukui.control-center.panel.plugins"
|
||||||
|
#define CONFIG_FILE "/etc/lightdm/ukui-greeter.conf"
|
||||||
|
+#define ON_TAB_SHEET_WIDGET "#widgetNetworkManager{background-color: rgba(255,255,255,15%); border-radius: 4px; border: 2px solid #2C73C8;}"
|
||||||
|
+#define ON_NORMAL_SHEET_WIDGET "#widgetNetworkManager{text-align:center;color: rgba(255, 255, 255, 255);border: none;border-radius: 4px;outline: none;}"
|
||||||
|
#define ON_TAB_SHEET "QPushButton{background-color: rgba(255,255,255,15%); border-radius: 4px; border: 2px solid #2C73C8;}"
|
||||||
|
#define ON_NORMAL_SHEET "QPushButton{text-align:center;color: rgba(255, 255, 255, 255);border: none;border-radius: 4px;outline: none;} \
|
||||||
|
QPushButton::hover{background-color: rgba(255,255,255,15%);} \
|
||||||
|
@@ -98,9 +100,6 @@ LockWidget::LockWidget(QWidget *parent)
|
||||||
|
// connect(this, &LockWidget::capsLockChanged,
|
||||||
|
// authDialog, &AuthDialog::onCapsLockChanged);
|
||||||
|
|
||||||
|
-// connect(m_kylinNM, &KylinNM::onConnectChanged, this,[=](){
|
||||||
|
-// updateNetIcon(m_kylinNM->getConnectStatus());
|
||||||
|
-// });
|
||||||
|
curFontSize = configuration->getFontSize();
|
||||||
|
this->installEventFilter(this);
|
||||||
|
initUI();
|
||||||
|
@@ -191,25 +190,6 @@ bool LockWidget::eventFilter(QObject *obj, QEvent *event)
|
||||||
|
//qDebug()<<"````````````````````````````````````````````"<<event->type();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
-/*
|
||||||
|
- if(event->type() == QEvent::WindowActivate){
|
||||||
|
- if(!isNetFinished){
|
||||||
|
- isNetFinished = true;
|
||||||
|
- QTimer::singleShot(1000, this, [=](){
|
||||||
|
- loadNetPlugin();
|
||||||
|
-// m_kylinNM = new KylinNM(this);
|
||||||
|
-// m_kylinNM->installEventFilter(this);
|
||||||
|
-// connect(m_kylinNM, &KylinNM::onConnectChanged, this,[=](){
|
||||||
|
-// updateNetIcon(m_kylinNM->getConnectStatus());
|
||||||
|
-// });
|
||||||
|
-// m_kylinNM->hide();
|
||||||
|
-// QtConcurrent::run([=](){
|
||||||
|
-// updateNetIcon(getNetStatus());
|
||||||
|
-// });
|
||||||
|
- });
|
||||||
|
- }
|
||||||
|
- }
|
||||||
|
-*/
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -262,7 +242,7 @@ void LockWidget::key_enter_release(int key)
|
||||||
|
case NETWORKBTN:
|
||||||
|
if(!m_kylinNM || !(m_kylinNM && m_kylinNM->isVisible()))
|
||||||
|
showNetManager(true);
|
||||||
|
- btnNetworkManager->setStyleSheet(ON_NORMAL_SHEET);
|
||||||
|
+ widgetNetworkManager->setStyleSheet(ON_NORMAL_SHEET_WIDGET);
|
||||||
|
authDialog->setFocusin(REMOVE);
|
||||||
|
break;
|
||||||
|
case KEYBOARDBTN:
|
||||||
|
@@ -559,19 +539,19 @@ void LockWidget::setBottomBtnSheet()
|
||||||
|
case BATTERYBTN:
|
||||||
|
ui->btnBatteryStatus->setStyleSheet(ON_TAB_SHEET);
|
||||||
|
ui->btnSwitchUser->setStyleSheet(ON_NORMAL_SHEET);
|
||||||
|
- btnNetworkManager->setStyleSheet(ON_NORMAL_SHEET);
|
||||||
|
+ widgetNetworkManager->setStyleSheet(ON_NORMAL_SHEET_WIDGET);
|
||||||
|
ui->btnKeyboard->setStyleSheet(ON_NORMAL_SHEET);
|
||||||
|
ui->btnPowerManager->setStyleSheet(ON_NORMAL_SHEET);
|
||||||
|
break;
|
||||||
|
case SWITCHBTN:
|
||||||
|
ui->btnSwitchUser->setStyleSheet(ON_TAB_SHEET);
|
||||||
|
- btnNetworkManager->setStyleSheet(ON_NORMAL_SHEET);
|
||||||
|
+ widgetNetworkManager->setStyleSheet(ON_NORMAL_SHEET_WIDGET);
|
||||||
|
ui->btnKeyboard->setStyleSheet(ON_NORMAL_SHEET);
|
||||||
|
ui->btnPowerManager->setStyleSheet(ON_NORMAL_SHEET);
|
||||||
|
ui->btnBatteryStatus->setStyleSheet(ON_NORMAL_SHEET);
|
||||||
|
break;
|
||||||
|
case NETWORKBTN:
|
||||||
|
- btnNetworkManager->setStyleSheet(ON_TAB_SHEET);
|
||||||
|
+ widgetNetworkManager->setStyleSheet(ON_TAB_SHEET_WIDGET);
|
||||||
|
ui->btnKeyboard->setStyleSheet(ON_NORMAL_SHEET);
|
||||||
|
ui->btnPowerManager->setStyleSheet(ON_NORMAL_SHEET);
|
||||||
|
ui->btnSwitchUser->setStyleSheet(ON_NORMAL_SHEET);
|
||||||
|
@@ -581,19 +561,19 @@ void LockWidget::setBottomBtnSheet()
|
||||||
|
ui->btnKeyboard->setStyleSheet(ON_TAB_SHEET);
|
||||||
|
ui->btnPowerManager->setStyleSheet(ON_NORMAL_SHEET);
|
||||||
|
ui->btnSwitchUser->setStyleSheet(ON_NORMAL_SHEET);
|
||||||
|
- btnNetworkManager->setStyleSheet(ON_NORMAL_SHEET);
|
||||||
|
+ widgetNetworkManager->setStyleSheet(ON_NORMAL_SHEET_WIDGET);
|
||||||
|
ui->btnBatteryStatus->setStyleSheet(ON_NORMAL_SHEET);
|
||||||
|
break;
|
||||||
|
case POWERBTN:
|
||||||
|
ui->btnPowerManager->setStyleSheet(ON_TAB_SHEET);
|
||||||
|
ui->btnSwitchUser->setStyleSheet(ON_NORMAL_SHEET);
|
||||||
|
- btnNetworkManager->setStyleSheet(ON_NORMAL_SHEET);
|
||||||
|
+ widgetNetworkManager->setStyleSheet(ON_NORMAL_SHEET_WIDGET);
|
||||||
|
ui->btnKeyboard->setStyleSheet(ON_NORMAL_SHEET);
|
||||||
|
ui->btnBatteryStatus->setStyleSheet(ON_NORMAL_SHEET);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
ui->btnSwitchUser->setStyleSheet(ON_NORMAL_SHEET);
|
||||||
|
- btnNetworkManager->setStyleSheet(ON_NORMAL_SHEET);
|
||||||
|
+ widgetNetworkManager->setStyleSheet(ON_NORMAL_SHEET_WIDGET);
|
||||||
|
ui->btnKeyboard->setStyleSheet(ON_NORMAL_SHEET);
|
||||||
|
ui->btnPowerManager->setStyleSheet(ON_NORMAL_SHEET);
|
||||||
|
ui->btnBatteryStatus->setStyleSheet(ON_NORMAL_SHEET);
|
||||||
|
@@ -601,7 +581,7 @@ void LockWidget::setBottomBtnSheet()
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
ui->btnSwitchUser->setStyleSheet(ON_NORMAL_SHEET);
|
||||||
|
- btnNetworkManager->setStyleSheet(ON_NORMAL_SHEET);
|
||||||
|
+ widgetNetworkManager->setStyleSheet(ON_NORMAL_SHEET_WIDGET);
|
||||||
|
ui->btnKeyboard->setStyleSheet(ON_NORMAL_SHEET);
|
||||||
|
ui->btnPowerManager->setStyleSheet(ON_NORMAL_SHEET);
|
||||||
|
ui->btnBatteryStatus->setStyleSheet(ON_NORMAL_SHEET);
|
||||||
|
@@ -796,21 +776,15 @@ void LockWidget::initUI()
|
||||||
|
,this,&LockWidget::showPowerManager);
|
||||||
|
|
||||||
|
|
||||||
|
-// QtConcurrent::run([=](){
|
||||||
|
-// updateNetIcon(getNetStatus());
|
||||||
|
-// });
|
||||||
|
|
||||||
|
- btnNetworkManager = new KyNetworkIcon(this);
|
||||||
|
- btnNetworkManager->setStyleSheet("QPushButton{text-align:center;color: rgba(255, 255, 255, 255);border: none;border-radius: 4px;outline: none;} \
|
||||||
|
- QPushButton::hover{background-color: rgba(255,255,255,15%);} \
|
||||||
|
- QPushButton::pressed {background-color: rgba(255,255,255,40%);}\
|
||||||
|
- QPushButton::checked {background-color: rgba(255, 255, 255, 40%);}");
|
||||||
|
+ widgetNetworkManager = new QWidget(this);
|
||||||
|
+ widgetNetworkManager->setObjectName("widgetNetworkManager");
|
||||||
|
+ widgetNetworkManager->setFixedSize(48,48);
|
||||||
|
+ btnNetworkManager = new KyNetworkIcon(widgetNetworkManager);
|
||||||
|
btnNetworkManager->setCheckable(true);
|
||||||
|
btnNetworkManager->setFixedSize(48,48);
|
||||||
|
btnNetworkManager->setIconSize(QSize(24,24));
|
||||||
|
btnNetworkManager->setFocusPolicy(Qt::NoFocus);
|
||||||
|
-// ui->btnNetworkManager->setStyleSheet("QPushButton:Hover{border-radius:24px;background-color:rgba(255, 255, 255, 0.15);}"
|
||||||
|
-// "QPushButton:Pressed{border-radius:24px;background-color:rgba(255, 255, 255, 0.05);}");
|
||||||
|
btnNetworkManager->installEventFilter(this);
|
||||||
|
btnNetworkManager->setCursor(Qt::PointingHandCursor);
|
||||||
|
|
||||||
|
@@ -1087,7 +1061,8 @@ void LockWidget::showWarning(QVector<InhibitInfo::InhibitorInfo> &wlist, int typ
|
||||||
|
sureWidget->setFocus();
|
||||||
|
ui->widgetTime->hide();
|
||||||
|
ui->btnPowerManager->hide();
|
||||||
|
- btnNetworkManager->hide();
|
||||||
|
+ //btnNetworkManager->hide();
|
||||||
|
+ widgetNetworkManager->hide();
|
||||||
|
ui->btnSwitchUser->hide();
|
||||||
|
ui->btnKeyboard->hide();
|
||||||
|
ui->btnBatteryStatus->hide();
|
||||||
|
@@ -1109,7 +1084,8 @@ void LockWidget::switchToSureDialog(int type)
|
||||||
|
sureWidget->setFocus();
|
||||||
|
ui->widgetTime->hide();
|
||||||
|
ui->btnPowerManager->hide();
|
||||||
|
- btnNetworkManager->hide();
|
||||||
|
+ widgetNetworkManager->hide();
|
||||||
|
+ //btnNetworkManager->hide();
|
||||||
|
ui->btnSwitchUser->hide();
|
||||||
|
ui->btnKeyboard->hide();
|
||||||
|
ui->btnBatteryStatus->hide();
|
||||||
|
@@ -1123,7 +1099,8 @@ void LockWidget::hideSureDialog()
|
||||||
|
powermanager->show();
|
||||||
|
ui->widgetTime->show();
|
||||||
|
ui->btnPowerManager->show();
|
||||||
|
- btnNetworkManager->show();
|
||||||
|
+ widgetNetworkManager->show();
|
||||||
|
+ //btnNetworkManager->show();
|
||||||
|
ui->btnSwitchUser->show();
|
||||||
|
ui->btnKeyboard->show();
|
||||||
|
ui->btnBatteryStatus->show();
|
||||||
|
@@ -1142,7 +1119,8 @@ void LockWidget::confirmClicked()
|
||||||
|
authDialog->show();
|
||||||
|
ui->widgetTime->show();
|
||||||
|
ui->btnPowerManager->show();
|
||||||
|
- btnNetworkManager->show();
|
||||||
|
+ widgetNetworkManager->show();
|
||||||
|
+ //btnNetworkManager->show();
|
||||||
|
ui->btnSwitchUser->show();
|
||||||
|
ui->btnKeyboard->show();
|
||||||
|
ui->btnBatteryStatus->show();
|
||||||
|
@@ -1335,27 +1313,6 @@ int LockWidget::getNetStatus()
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
-void LockWidget::updateNetIcon(int status)
|
||||||
|
-{
|
||||||
|
- switch(status) {
|
||||||
|
- case 0:
|
||||||
|
- //有线
|
||||||
|
- btnNetworkManager->setIcon(QIcon(":/image/assets/intel/icon-wired.png"));
|
||||||
|
- break;
|
||||||
|
- case 1:
|
||||||
|
- //无线
|
||||||
|
- btnNetworkManager->setIcon(QIcon(":/image/assets/intel/icon-wifi.png"));
|
||||||
|
- break;
|
||||||
|
- case 2:
|
||||||
|
- //有线+无线
|
||||||
|
- btnNetworkManager->setIcon(QIcon(":/image/assets/intel/icon-wired.png"));
|
||||||
|
- break;
|
||||||
|
- default:
|
||||||
|
- //无连接
|
||||||
|
- btnNetworkManager->setIcon(QIcon(":/image/assets/intel/icon-no-signal.png"));
|
||||||
|
- }
|
||||||
|
-}
|
||||||
|
-
|
||||||
|
void LockWidget::loadNetPlugin()
|
||||||
|
{
|
||||||
|
m_kylinNM = new QWidget(this);
|
||||||
|
@@ -1665,8 +1622,8 @@ void LockWidget::resizeEvent(QResizeEvent *event)
|
||||||
|
ui->btnKeyboard->move(width() - x, height() - y);
|
||||||
|
}
|
||||||
|
|
||||||
|
- x = x + btnNetworkManager->width()+16;
|
||||||
|
- btnNetworkManager->move(width() - x, height() - y);
|
||||||
|
+ x = x + widgetNetworkManager->width()+16;
|
||||||
|
+ widgetNetworkManager->move(width() - x, height() - y);
|
||||||
|
|
||||||
|
if(!ui->btnSwitchUser->isHidden()) {
|
||||||
|
x = x + ui->btnSwitchUser->width()+16;
|
||||||
|
@@ -1878,7 +1835,7 @@ bool LockWidget::exitSubWidget()
|
||||||
|
setCheckedSheet(NETWORKBTN, false);
|
||||||
|
at_plugins = false;
|
||||||
|
if(tabAt == BOTTMBTN && horAT == NETWORKBTN)
|
||||||
|
- btnNetworkManager->setStyleSheet(ON_TAB_SHEET);
|
||||||
|
+ widgetNetworkManager->setStyleSheet(ON_TAB_SHEET_WIDGET);
|
||||||
|
allExited = false;
|
||||||
|
} else if(vKeyboard && vKeyboard->isVisible()) {
|
||||||
|
vKeyboard->hide();
|
||||||
|
diff --git a/src/lockwidget.h b/src/lockwidget.h
|
||||||
|
index 0291240..da89db0 100644
|
||||||
|
--- a/src/lockwidget.h
|
||||||
|
+++ b/src/lockwidget.h
|
||||||
|
@@ -105,7 +105,6 @@ private:
|
||||||
|
void initUI();
|
||||||
|
void initUserMenu();
|
||||||
|
void setVirkeyboardPos();
|
||||||
|
- void updateNetIcon(int status);
|
||||||
|
bool getLoadStatus(const QString &name);
|
||||||
|
int getNetStatus();
|
||||||
|
void key_OB_release(int key);
|
||||||
|
@@ -186,6 +185,7 @@ private:
|
||||||
|
int powermanagerType;
|
||||||
|
int nowAt = -1;
|
||||||
|
int loginedNum = 0;
|
||||||
|
+ QWidget *widgetNetworkManager = nullptr;
|
||||||
|
QPushButton *btnNetworkManager = nullptr;
|
||||||
|
bool m_isStartupMode = false;
|
||||||
|
bool is_switchBtn = true;
|
||||||
|
diff --git a/src/ukui-screensaver-dialog.cpp b/src/ukui-screensaver-dialog.cpp
|
||||||
|
index ef1a3f7..9443b8a 100644
|
||||||
|
--- a/src/ukui-screensaver-dialog.cpp
|
||||||
|
+++ b/src/ukui-screensaver-dialog.cpp
|
||||||
|
@@ -26,6 +26,7 @@
|
||||||
|
#include <QDateTime>
|
||||||
|
#include <QWidget>
|
||||||
|
#include <QDebug>
|
||||||
|
+#include <QX11Info>
|
||||||
|
#include <QDesktopWidget>
|
||||||
|
#include <QDBusInterface>
|
||||||
|
#include "plasma-shell-manager.h"
|
||||||
|
@@ -253,10 +254,7 @@ int main(int argc, char *argv[])
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifndef USE_INTEL
|
||||||
|
- if (QString(qgetenv("XDG_SESSION_TYPE")) == "wayland")
|
||||||
|
- window->show();
|
||||||
|
- else
|
||||||
|
- window->show();
|
||||||
|
+ window->show();
|
||||||
|
window->activateWindow();
|
||||||
|
#endif
|
||||||
|
if(parser.isSet(lockOption))
|
||||||
|
@@ -300,7 +298,7 @@ int main(int argc, char *argv[])
|
||||||
|
|
||||||
|
|
||||||
|
bool isWayland = false;
|
||||||
|
- if(QString(qgetenv("XDG_SESSION_TYPE")) == "wayland") {
|
||||||
|
+ if(QString(qgetenv("XDG_SESSION_TYPE")) == "wayland" && !QX11Info::isPlatformX11()) {
|
||||||
|
isWayland = true;
|
||||||
|
}
|
||||||
|
if (isWayland){
|
|
@ -1 +1,2 @@
|
||||||
0001-update-changelog.patch
|
0001-update-changelog.patch
|
||||||
|
0002-update-changelog.patch
|
||||||
|
|
Loading…
Reference in New Issue