23 Commits

Author SHA1 Message Date
范朋程
36e27cdd5a feat: 代码解构整理,输出日志信息
做到多屏功能都有对应的日志可查,后期稳定后再去除

Log: 代码解构整理,输出日志信息
Change-Id: I76a5ab48aad4fc7cfbabe38b159f449b34444530
Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/4001
Tested-by: <mailman@uniontech.com>
Reviewed-by: fanpengcheng <fanpengcheng@uniontech.com>
Reviewed-by: <mailman@uniontech.com>
2020-09-08 20:43:14 +08:00
范朋程
234346a22c fix: 修复切换显示模式后无法拖拽调整任务栏高度的问题
显示模式切换后未能更新拖拽区域,及时更新一下就好

Log: 修复切换显示模式后无法拖拽调整任务栏高度的问题
Bug: https://pms.uniontech.com/zentao/bug-view-46393.html
Change-Id: I5bf5ebdf9b510bf5dd4d05e5488ab6e378ba2812
Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/3680
Reviewed-by: pengwenhao <pengwenhao@uniontech.com>
Reviewed-by: niecheng <niecheng@uniontech.com>
Reviewed-by: fanpengcheng <fanpengcheng@uniontech.com>
Tested-by: fanpengcheng <fanpengcheng@uniontech.com>
2020-09-04 18:42:44 +08:00
范朋程
1067a0fe95 fix: 修复任务栏启动器找不到显示器导致其崩溃的问题
修复任务栏启动器找不到显示器导致其崩溃的问题

Log: 修复任务栏启动器找不到显示器导致其崩溃的问题
Change-Id: Ib1bff6b7f255df521c41029c4c2417e43211931f
Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/3435
Reviewed-by: wangwei <wangwei@uniontech.com>
Reviewed-by: fanpengcheng <fanpengcheng@uniontech.com>
Tested-by: fanpengcheng <fanpengcheng@uniontech.com>
2020-09-04 18:41:58 +08:00
liuxing
fe975cc136 feat: 调整任务栏隐藏时触屏唤起手指滑动距离
之前按任务栏当前高度唤起,当任务栏高度较小时,产品认为体验不好,调整为固定高度100+任务栏与边缘间距

Log: 调整任务栏隐藏时触屏唤起手指滑动距离
Change-Id: I521941db2ae5eea68fcad7e9795ca5c7de98faa8
Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/3458
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: wangwei <wangwei@uniontech.com>
Reviewed-by: fanpengcheng <fanpengcheng@uniontech.com>
Tested-by: <mailman@uniontech.com>
2020-09-03 20:16:47 +08:00
范朋程
883c74f479 fix: 修复一处任务栏显示异常的问题
windowSizeFashion和windowSizeEfficient给出的值始终对应前端认为的界面高度或宽度.举例:当前缩放为2时,任务栏为高效模式,windowSizeEfficient对应值为50,那么任务栏显示的高度应该为50*2个像素

Log: 修复一处任务栏显示异常的问题
Task: https://pms.uniontech.com/zentao/task-view-36233.html
Change-Id: I1986ca9d1b0d6fad67186c9bad210a54f153095b
Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/3301
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: wangwei <wangwei@uniontech.com>
Reviewed-by: niecheng <niecheng@uniontech.com>
Tested-by: <mailman@uniontech.com>
2020-09-03 13:37:10 +08:00
liuxing
13b23e1dbd feat: 增加触屏功能
根据后端长按一秒信号处理拖拽任务栏高度;根据后端xevent注册区域监控,处理任务栏隐藏,单指滑动唤醒任务栏

Log: 增加任务栏触屏功能
Task: https://pms.uniontech.com/zentao/task-view-33543.html
Change-Id: Ic862cc75a3cf89235702ca4fc2bcb27b28b0b418
Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/2240
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: fanpengcheng <fanpengcheng@uniontech.com>
Reviewed-by: wangwei <wangwei@uniontech.com>
Tested-by: <mailman@uniontech.com>
2020-08-31 18:40:33 +08:00
范朋程
26df6a2871 feat: 限制缩放情况下任务栏的最小高度,防止显示图标异常
任务栏的最小高度范围为40-100,在开启缩放情况下,最小就不应该是40,比如开启1.25倍时,应为50才对

Log: 限制缩放情况下任务栏的最小高度,防止显示图标异常
Change-Id: I2b27f708636c4a0ff80f65e9bccc3bd4641fe201
Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/3024
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: fanpengcheng <fanpengcheng@uniontech.com>
Reviewed-by: pengwenhao <pengwenhao@uniontech.com>
Tested-by: <mailman@uniontech.com>
2020-08-31 13:12:49 +08:00
Nie Cheng
843355f5e8 fix: 拔掉显示器一段时间后插上,任务栏没有显示
拔掉最后一个显示器后,插上显示器没有及时更新dock

Log: 拔掉显示器一段时间后插上,任务栏没有显示
Bug: https://pms.uniontech.com/zentao/bug-view-43166.html
Change-Id: I800cc6e0cdd287e125cd9104af7b91e0647ad1a6
Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/2512
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: qiumengdan <qiumengdan@uniontech.com>
Reviewed-by: niecheng <niecheng@uniontech.com>
Tested-by: <mailman@uniontech.com>
2020-08-20 17:42:28 +08:00
范朋程
aa389b16cd feat: 鼠标在唤醒区域超过2秒,任务栏才会唤醒
鼠标在其他屏幕的唤醒区域超过2秒,任务栏才会唤醒,防止任务栏频繁切换屏幕

Log: 鼠标在其他屏幕的唤醒区域超过2秒,任务栏才会唤醒
Task: https://pms.uniontech.com/zentao/task-view-33535.html
Change-Id: I58de80b869dbaaf815d5b8b70fa6e80de1ed569e
Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/1579
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: fanpengcheng <fanpengcheng@uniontech.com>
Tested-by: <mailman@uniontech.com>
Tested-by: fanpengcheng <fanpengcheng@uniontech.com>
2020-08-12 21:24:36 +08:00
范朋程
d333bcd545 fix: 解决智能隐藏模式下,从主屏切换到副屏任务栏不显示问题
切换到副屏时,FrontendWindowRect接口未设置成副屏位置,导致HideState未发生变化,

Log: 解决智能隐藏模式下,从主屏切换到副屏任务栏不显示问题
Bug: https://pms.uniontech.com/zentao/bug-view-42055.html
Change-Id: I793269c58aeb9a3f672378c6a5a3d835605815d6
2020-08-12 09:59:27 +08:00
Fan PengCheng
da5f72414a fix: 修复启动器位置显示与任务栏有重叠问题
con.deepin.dde.daemon.Dock的FrontendWindowRect接口数据设置错误

Log: 复启动器位置显示与任务栏有重叠问题
Bug: https://pms.uniontech.com/zentao/bug-view-42095.html
Bug: https://pms.uniontech.com/zentao/bug-view-42055.html
Change-Id: I73699df82683d87f0f5f18e8cbd0a750efde5fce
Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/1494
Reviewed-by: fanpengcheng <fanpengcheng@uniontech.com>
Tested-by: fanpengcheng <fanpengcheng@uniontech.com>
2020-08-10 21:58:39 +08:00
Fan PengCheng
60e629dbbb fix: 修复时尚模式显示模式任务栏高度显示问题
任务栏高度发生变化后,写入后端接,之前是值计算错了,

Log: 修复时尚模式显示模式任务栏高度显示问题
Change-Id: I5aba6f439d0b7f7901287d0080ecb39f92a9ab54
Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/1467
Reviewed-by: fanpengcheng <fanpengcheng@uniontech.com>
Tested-by: fanpengcheng <fanpengcheng@uniontech.com>
2020-08-08 00:57:44 +08:00
Fan PengCheng
cfe77faff2 fix: 解决桌面无窗口,切换为智能隐藏模式后任务栏隐藏问题
智能模式下为显示状态时,切换模式,不做隐藏操作

Log: 解决桌面无窗口,切换为智能隐藏模式后任务栏隐藏问题
Bug: https://pms.uniontech.com/zentao/bug-view-41907.html
Change-Id: I29208fc36266cd1f4404c8ac1ad9d5d60b8ebea0
Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/1465
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: fanpengcheng <fanpengcheng@uniontech.com>
Tested-by: <mailman@uniontech.com>
Tested-by: fanpengcheng <fanpengcheng@uniontech.com>
2020-08-07 23:15:14 +08:00
Fan PengCheng
f2e5b92096 fix: 修复隐藏模式下调整位置任务栏不隐藏的问题
一直隐藏模式或能隐藏模式且为隐藏状态时,任务栏切换位置直接隐藏就好

Log: 修复隐藏模式下调整位置任务栏不隐藏的问题
Bug: https://pms.uniontech.com/zentao/bug-view-41920.html
Change-Id: Ia75a7bc209050f0c4e75cb9563bdc5bffbecb2a8
Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/1464
Reviewed-by: fanpengcheng <fanpengcheng@uniontech.com>
Tested-by: fanpengcheng <fanpengcheng@uniontech.com>
2020-08-07 23:12:03 +08:00
Fan PengCheng
2d93feb822 fix: 修复2D情况下仍然使用动画的情况
2D情况下,未及时更新动画的过渡时间

Log: 修复2D情况下仍然使用动画的情况
Change-Id: I5fe92eb0769e82edbb957b8c247d5b00e955902e
Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/1462
Reviewed-by: fanpengcheng <fanpengcheng@uniontech.com>
Tested-by: fanpengcheng <fanpengcheng@uniontech.com>
2020-08-07 23:10:34 +08:00
Fan PengCheng
1170afd823 fix: 修复任务栏写入后端接口数据错误,导致启动器显示位置异常问题
写入后端接口的数据是计算了缩放的,但启动器又计算了一遍,导致计算位置错误

Log: 修复启动器显示位置异常的问题
Change-Id: Ib1ff62f100cc1145bf0d39cfa03730ad08715cfc
Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/1461
Reviewed-by: fanpengcheng <fanpengcheng@uniontech.com>
Tested-by: fanpengcheng <fanpengcheng@uniontech.com>
2020-08-07 23:09:49 +08:00
Fan PengCheng
0fb8fbc539 fix: 修复缩放导致任务栏显示不全的问题
之前计算缩放时计算了区域的左上角,实际上Display服务获取的桌面大小的topLeft坐标是对的,其size需计算要缩放

Log: 修复缩放导致任务栏显示不全的问题
Change-Id: Id7488735831231e698ad2ead51521fa980b4bafc
Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/1410
Reviewed-by: fanpengcheng <fanpengcheng@uniontech.com>
Tested-by: fanpengcheng <fanpengcheng@uniontech.com>
2020-08-06 23:36:01 +08:00
Fan PengCheng
6d8f391d75 fix: 修复右下角显示桌面在时尚模式下出现的问题
切换模式时更新一下右下角'显示桌面'的区域

Log: 修复右下角显示桌面在时尚模式下出现的问题
Change-Id: Ibdad4a6c62b21598f11e3d71b5cc12adcaaae5d0
Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/1408
Reviewed-by: fanpengcheng <fanpengcheng@uniontech.com>
Tested-by: fanpengcheng <fanpengcheng@uniontech.com>
2020-08-06 22:53:14 +08:00
Fan PengCheng
3deb70cbca fix: 修复HideState循环切换显示隐藏状态的问题
向com.deepin.dde.daemon.Dock的SetFrontendWindowRect接口设置区域时,此区域的高度或宽度不能为0,否则会导致其HideState属性循环切换,造成任务栏循环显示或隐藏

Log: 修复一处导致任务栏显示异常的问题
Change-Id: Iaa57bd130fee8569cb7d57e7cfc0ff6105624291
Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/1407
Reviewed-by: fanpengcheng <fanpengcheng@uniontech.com>
Tested-by: fanpengcheng <fanpengcheng@uniontech.com>
2020-08-06 22:53:09 +08:00
Fan PengCheng
08c543da63 fix: 修复任务栏切换显示模式时图标显示异常问题
任务栏切换显示模式时,未设置内部内容的大小,内部内容的大小还是另外的显示模式的大小

Log: 修复任务栏切换显示模式时图标显示异常问题
Bug: https://pms.uniontech.com/zentao/bug-view-41663.html
Change-Id: Iac23581127710b43f89ed42c7b293c338b08d55b
Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/1401
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: niecheng <niecheng@uniontech.com>
Reviewed-by: fanpengcheng <fanpengcheng@uniontech.com>
Tested-by: <mailman@uniontech.com>
2020-08-06 20:37:12 +08:00
Fan PengCheng
a73eca90be fix: 修复任务栏在arm平台上显示位置需要触发两次的问题
arm平台无动画,之前设置位置是在动画中设置,动画结束后未设置,现在动画结束时再设置一次即可

Log: 修复任务栏在arm平台切换位置显示异常问题
Bug: https://pms.uniontech.com/zentao/bug-view-41658.html
Bug: https://pms.uniontech.com/zentao/bug-view-41724.html
Change-Id: Ib0f24547474fa14fc9c09038042ddc261b79c3f5
Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/1389
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: niecheng <niecheng@uniontech.com>
Reviewed-by: fanpengcheng <fanpengcheng@uniontech.com>
Tested-by: <mailman@uniontech.com>
2020-08-06 20:36:49 +08:00
Fan PengCheng
69e9dfa656 fix: 解决任务栏启动后不显示问题
计算显示位置时未考虑缩放因素,重构代码中未考虑这里

Log: 修复开启缩放后,任务栏显示一场问题
Bug: https://pms.uniontech.com/zentao/bug-view-41620.html
Change-Id: I03026852f261c78bb0d2e8a6f650c9b8f3805c16
Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/1379
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: niecheng <niecheng@uniontech.com>
Reviewed-by: fanpengcheng <fanpengcheng@uniontech.com>
Tested-by: <mailman@uniontech.com>
2020-08-06 20:35:48 +08:00
Fan PengCheng
dc88a3e14c fix: 重构任务栏的多屏功能代码
重构此部分代码,因时间太长了,rebase会带来较多的冲突,目前手摘取过来

Log: 重构任务栏的多屏功能代码
Change-Id: I23200f7d7d12e05b75909a38c8081fc435d019eb
Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/1353
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: lizhongming <lizhongming@uniontech.com>
Tested-by: <mailman@uniontech.com>
2020-08-05 21:52:37 +08:00