!61 fixBugs

Merge pull request !61 from jiawei/openkylin/yangtze

UI/player/playsongarea.cpp

@@ -1,5 +1,5 @@
 #include <ukui-log4qt.h>
-
+#include "UIControl/global/global.h"
 #include "playsongarea.h"
 #include "UI/base/widgetstyle.h"
 #include "UI/base/xatom-helper.h"
@@ -370,9 +370,22 @@ void PlaySongArea::slotVolSliderWidget()
     {
         kdk::UkuiStyleHelper::self()->removeHeader((QWidget *)m_volSliderWid);
         moveVolSliderWid();
-        m_volSliderWid->show();
-        m_volSliderWid->raise(); 
         kdk::WindowManager::setGeometry(m_volSliderWid->windowHandle(), QRect(volumePos, m_volSliderWid->size()));
+        if (Global::isWayland) {
+            m_volSliderWid->show();
+            m_volSliderWid->raise();
+            volumeBtn->clearFocus();
+            m_volSliderWid->vSlider->setFocus();
+            m_volSliderWid->vSlider->setVisible(true);
+            volumeBtn->setProperty("checked",false);
+
+
+        }
+        else{
+            m_volSliderWid->show();
+            m_volSliderWid->raise();
+
+        }
     }
 }
 
@@ -704,7 +717,6 @@ void PlaySongArea::resizeEvent(QResizeEvent *event)
 void PlaySongArea::moveVolSliderWid()
 {
     if (m_volSliderWid){
-        m_volSliderWid->setWindowFlags(Qt::Popup);
         volumePos = volumeBtn->mapToGlobal(volumeBtn->rect().center());
 
         m_volSliderWid->adjustSize();

UI/player/sliderwidget.cpp

@@ -9,6 +9,9 @@
 
 SliderWidget::SliderWidget(QWidget *parent) : QDialog(parent)
 {
+    if(WidgetStyle::isWayland){
+        setWindowFlags(Qt::Popup);
+    }
     this->installEventFilter(this);
 
     this->setAutoFillBackground(true);

UI/tableview/tablebaseview.cpp

@@ -65,13 +65,17 @@ void TableBaseView::mouseMoveEvent(QMouseEvent *event)
     Q_EMIT hoverIndexChanged(index);
 }
 
-void TableBaseView::mousePressEvent(QMouseEvent *event)
+//void TableBaseView::mousePressEvent(QMouseEvent *event)
+//{
+//    g_user_signal->hideSearchResult();
+
+//    QWidget::mousePressEvent(event);
+//}
+void TableBaseView::mouseDoubleClickEvent(QMouseEvent *event)
 {
-    g_user_signal->hideSearchResult();
-
-    QWidget::mousePressEvent(event);
+    QModelIndex index = this->indexAt(event->pos());
+    Q_EMIT doubleClicked(index);
 }
-
 void TableBaseView::leaveEvent(QEvent *event)
 {
     Q_EMIT leaveFromItem();

UI/tableview/tablebaseview.h

@@ -27,7 +27,8 @@ public Q_SLOTS:
     void setNowPlayListName(QString listName);
 protected:
     void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
-    void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
+    //void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
+    void mouseDoubleClickEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
     void leaveEvent(QEvent *event) Q_DECL_OVERRIDE;
 Q_SIGNALS:
     void hoverIndexChanged(QModelIndex index);

debian/changelog

@@ -1,3 +1,16 @@
+kylin-music (1.1.0.47-ok7.5) yangtze; urgency=medium
+
+  * BUG: #I8JOEJ 【V2.0】【不重要】【UKUI4.10】【需求 22231】【音乐】点击音量按钮，按键盘上下键无法调节音量（但此时再点一下音量调节条后，按上下键可以正常调节音量）
+         #I8JRFH 【V2.0】【主要】【音乐】双击播放列表中音频信息无法播放此音频 
+         #I8LI8I 【重要】【音乐】音乐右键菜单部分功能失效-删除、信息显示 
+         #I8JPN4 【V2.0】【主要】【音乐】右键音频列表点击播放，点击的音乐、下方显示正在播放的音乐信息、实际播放的音乐均不对应 
+  * 任务号：无
+  * 需求号：无
+  * 其他改动说明：无
+  * 其他改动影响域：无
+
+ -- jiawei <jiawei@kylinos.cn>  Thu, 14 Dec 2023 15:53:44 +0800
+
 kylin-music (1.1.0.47-ok7.4) yangtze; urgency=medium
 
   * BUG: #I8J78R 【音乐】关于，只保留应用名称、版本、服务与支持团队链接