!33 更新changelog

Merge pull request !33 from 刘远鹏/openkylin/yangtze

debian/changelog

@@ -1,3 +1,19 @@
+ukui-screensaver (4.0.0.0-ok4~0704) yangtze; urgency=medium
+
+  * BUG号：bug##I72EYT【次要】【锁屏】锁屏界面平板模式切换横竖屏后软键盘下方显示不全（wayland中文）
+  * 需求号：无
+  * 其他修改说明：更新changelog
+
+ -- liuyuanpeng <liuyuanpeng@kylinos.cn>  Tue, 04 Jul 2023 15:41:42 +0800
+
+ukui-screensaver (4.0.0.0-ok3~0704) yangtze; urgency=medium
+
+  * BUG号：bug##I72EYT【次要】【锁屏】锁屏界面平板模式切换横竖屏后软键盘下方显示不全（wayland中文）
+  * 需求号：无
+  * 其他修改说明：处理编译依赖问题
+
+ -- liudun <liudun@kylinos.cn>  Tue, 04 Jul 2023 10:34:46 +0800
+
 ukui-screensaver (4.0.0.0-ok3~0628) yangtze; urgency=medium
 
   * BUG号：bug#I69CSS【锁屏】合盖后重新打开进入锁屏，此时锁屏界面下方图标会被遮住

debian/control

@@ -31,7 +31,7 @@ Build-Depends: debhelper-compat (= 12),
 	       ukui-input-gather (>=1.0.0.2),
 	       libinput-dev,
                libukuiinputgatherclient-dev,
-	       layer-shell-qt
+	       liblayershellqtinterface-dev
 Standards-Version: 4.5.0
 Rules-Requires-Root: no
 Homepage: https://www.github.com/ukui/ukui-screensaver
@@ -45,7 +45,6 @@ Depends: ethtool,
          ukui-session-manager,
          libpam-biometric(>=3.20.0.10),
          ukui-input-gather(>=1.0.0.2),
-	 layer-shell-qt,
          ${misc:Depends},
          ${shlibs:Depends}
 Replaces: ukui-screensaver-common (<< 2.0.0)

debian/patches/0004-33-changelog.patch

@@ -0,0 +1,51 @@
+From: =?utf-8?b?5YiY6L+c6bmP?=
+ <11195448+liuyuanpeng176@user.noreply.gitee.com>
+Date: Tue, 4 Jul 2023 07:48:01 +0000
+Subject: =?utf-8?b?ITMzIOabtOaWsGNoYW5nZWxvZyBNZXJnZSBwdWxsIHJlcXVlc3QgITMz?=
+ =?utf-8?b?IGZyb20g5YiY6L+c6bmPL29wZW5reWxpbi95YW5ndHpl?=
+
+---
+ VirtualKeyboard/src/virtualkeyboardwidget.h | 3 ++-
+ src/lockwidget.cpp                          | 8 ++++----
+ 2 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/VirtualKeyboard/src/virtualkeyboardwidget.h b/VirtualKeyboard/src/virtualkeyboardwidget.h
+index 3238662..b7abe87 100644
+--- a/VirtualKeyboard/src/virtualkeyboardwidget.h
++++ b/VirtualKeyboard/src/virtualkeyboardwidget.h
+@@ -44,6 +44,7 @@ public:
+     VirtualKeyboardWidget(QWidget *parent = nullptr);
+     virtual ~VirtualKeyboardWidget();
+     bool getFloatStatus();
++    void adjustGeometry();
+ 
+ public Q_SLOTS:
+     void onNormalBtnClicked(QChar c);
+@@ -63,7 +64,7 @@ protected:
+ private:
+     void initUI();
+     void initConnections();
+-    void adjustGeometry();
++//    void adjustGeometry();
+     void onMouseEvents(int type);
+     void clearModifier();
+ 
+diff --git a/src/lockwidget.cpp b/src/lockwidget.cpp
+index 15ed1a1..43eefb6 100644
+--- a/src/lockwidget.cpp
++++ b/src/lockwidget.cpp
+@@ -1415,10 +1415,10 @@ void LockWidget::setVirkeyboardPos()
+ {
+     if(vKeyboard)
+     {
+-        vKeyboard->setGeometry(0,
+-                               height() - height()/3,
+-                               width(), height()/3);
+-
++//        vKeyboard->setGeometry(0,
++//                               height() - height()/3,
++//                               width(), height()/3);
++        vKeyboard->adjustGeometry();
+     }
+ }
+ 

debian/patches/series

@@ -1,3 +1,4 @@
 0001-update-changelog.patch
 0002-update-changelog.patch
 0003-30-bug-I69CSS.patch
+0004-33-changelog.patch