83 Commits

Author SHA1 Message Date
xiechuan
648b990fc8 fix: 任务栏移除图标时提示信息异常
2D模式下,移除图标时,会使用一个新的图标,并缩小原来图标的大小,但设置鼠标拖动位置时判断图标错误,造成异常

Log: 修复2D模式下任务栏移除应用程序发现移除提示异常
Bug: https://pms.uniontech.com/zentao/bug-view-44994.html
Change-Id: I3a5e148582d5792555603825c8ca281c84bc4b33
Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/3026
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: fanpengcheng <fanpengcheng@uniontech.com>
Reviewed-by: niecheng <niecheng@uniontech.com>
Tested-by: <mailman@uniontech.com>
2020-08-31 11:15:26 +08:00
Gerrit Code Review
7c6cdc6b85 Merge "fix: Merge branch 'maintain/5.1' into uos" into uos 2020-08-27 13:47:40 +08:00
chenjun
cface16a58 fix: Merge branch 'maintain/5.1' into uos
将maintain/5.1合并到uos

Log: 合并分支代码
Change-Id: I72eb946ceecb80db492e8e582cbb64290dc606d0
2020-08-26 18:53:34 +08:00
Zhang Qipeng
6e3c6d5d2f fix: Overlapping icons in the taskbar
当应用图标区域上(左)边缘超出任务栏上规划的区域时,将应用图标区域上(左)边缘与规划区域对齐。

Log: 修复任务栏图标显示不下时重叠的问题。
Change-Id: I03ed43071772cb23d8e09834da180866d987e1b3
Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/2759
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: niecheng <niecheng@uniontech.com>
Reviewed-by: wangwei <wangwei@uniontech.com>
Tested-by: <mailman@uniontech.com>
2020-08-26 18:25:05 +08:00
Zhang Qipeng
72ebd36a51 fix: wrong size of icons in the taskbar
由于之前插件区域设置的大小策略有问题,导致计算图标大小的时候获取的插件区域大小错误,
导致算出的图标过小,仿佛消失了一样,故设置插件区域的大小策略为固定。

Log: 修复任务栏图标异常的问题。
Bug: https://pms.uniontech.com/zentao/bug-view-44065.html
Change-Id: Ic1000ed744878e7a7cfd08c80d5f119885057c39
Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/2717
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: fanpengcheng <fanpengcheng@uniontech.com>
Reviewed-by: niecheng <niecheng@uniontech.com>
Tested-by: <mailman@uniontech.com>
2020-08-26 16:56:47 +08:00
聂成
d60938ed33 fix: 2D模式下,应用区域没有移除驻留提示
2D模式下拖动任务栏的图标,会有移除信息提示

Log: 2D模式下,应用区域没有移除驻留提示
Bug: https://pms.uniontech.com/zentao/bug-view-41285.html
Change-Id: I0bcbe61cdf364f24c48fcd6ba083921c455f0e14
Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/2265
Reviewed-by: wangwei <wangwei@uniontech.com>
Reviewed-by: niecheng <niecheng@uniontech.com>
Reviewed-by: <mailman@uniontech.com>
Tested-by: <mailman@uniontech.com>
2020-08-18 16:55:32 +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
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
chenjun
fc8f45e8a4 fix: 重新调整任务栏图标大小计算方式
在计算任务栏宽度时,多次减掉图标间隔的距离,计算得到的固定图标大小偏小,而在启动器等多个固定图标偏小的情况下,会在任务栏上多出空白,由于应用图标
是按自适应扩展布局的,造成应用图标比启动器等固定图标偏大

Log: 修复任务栏在左方和右方时,固定区域三个图标比其他区域图标要小问题
Bug: https://pms.uniontech.com/zentao/bug-view-40639.html
Change-Id: I2aaeca3950b025b7eba71a6f90c66a90571196fd
Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/1141
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: lizhongming <lizhongming@uniontech.com>
Tested-by: <mailman@uniontech.com>
2020-08-05 16:13:48 +08:00
chenjun
a68b828c7e Merge remote-tracking branch 'upstream/maintain/5.1' into uos
Change-Id: I9379a941c0ff0dc99e1868e85eb7208c13ad4a40
2020-08-03 19:14:26 +08:00
liuxing
3cac2b187b feat: 显示桌面规则调整
鼠标移入显示桌面区域,预览桌面时再点击显示桌面依旧保持显示桌面

Log: 预览桌面时再点击显示桌面保持显示桌面
Task: https://pms.uniontech.com/zentao/task-view-30902.html
Change-Id: I71e492964e40aa1164c6fac2a3f45b6b7969881d
Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/1101
Reviewed-by: fanpengcheng <fanpengcheng@uniontech.com>
Tested-by: fanpengcheng <fanpengcheng@uniontech.com>
2020-08-03 10:45:43 +08:00
chenjun
554c324d14 fix: 去掉设置图标向下取偶数的大小的代码
原代码本意是为了解决在调整任务栏大小时,调整图标大小一致的,但是代码本身无法调整一致大小的图标,反而造成鼠标在界面上移动时,图标大小会变化而抖动
的问题

Log: 修复打开多个应用,将任务栏位置调整至左边或者右边,鼠标在任务栏和桌面间移动,任务栏固定区域和应用区域图标抖动的问题
Bug: https://pms.uniontech.com/zentao/bug-view-40176.html
Change-Id: Ibb18d4e16eeecd09be7d2e8b407dac17a12a2e7d
Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/983
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: lizhongming <lizhongming@uniontech.com>
Tested-by: <mailman@uniontech.com>
2020-07-30 19:09:21 +08:00
liuxing
31663a9ded feat: 任务栏单指长按支持拖动
任务栏图标拖动需要单指长按超过200ms后(后端提供判断信号),才可进行

Log: 根据后端长按信号,任务栏图标单指长按超过200ms后才可拖动
Task: https://pms.uniontech.com/zentao/task-view-30976.html
Change-Id: Ia75e7b09b7ea2421089a0e5b8be4ff9a5049bae3
Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/864
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: wangwei <wangwei@uniontech.com>
Reviewed-by: niecheng <niecheng@uniontech.com>
Tested-by: <mailman@uniontech.com>
2020-07-30 10:10:59 +08:00
liuxing
1a455503d9 feat: 任务栏显示桌面窗口优化
根据窗管给的接口,处理鼠标移入显示桌面窗口时,进行窗口显示处理

Log: 增加鼠标移入显示桌面窗口时显示桌面处理
Task: https://pms.uniontech.com/zentao/task-view-30902.html
Change-Id: I27121ada8c041277a9734a3398af2633830ef5ad
Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/762
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: wangwei <wangwei@uniontech.com>
Tested-by: <mailman@uniontech.com>
Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/914
Reviewed-by: gerrit <gerrit@uniontech.com>
Reviewed-by: niecheng <niecheng@uniontech.com>
2020-07-30 10:03:07 +08:00
zhaolong
7f730c867f fix: 固定区与应用区图标不一致
固定区图标所设值,与应用区图标自适应后调为一致

Log: 修复缩放任务栏时,启动器图标和应用图标大小不一致问题
Bug: https://pms.uniontech.com/zentao/bug-view-35028.html
2020-06-28 20:03:11 +08:00
范朋程
ee83bb1cba fix(cppcheck): cppcheck检查
静态代码检查,按照提示修改了所有合理的警告内容,部分内容为cppcheck误报,不处理

Log: 按照静态代码检查工具给出的结果进行修改
2020-06-16 13:54:23 +08:00
范朋程
a9a68ca779 fix: (自测)启动后报错问题处理
代码逻辑问题,合入代码时未仔细查看导致

Log: 修复任务栏启动就报错的问题
Task: https://pms.uniontech.com/zentao/task-view-26908.html
2020-06-15 11:38:46 +08:00
fengshaoxiong
1057ce28af fix: show same accessible name after widget destroyed
控件销毁后显示相同的标记名称
2020-06-04 14:01:08 +08:00
fpc_diesel
eecce9d618 feat(accessible):update accessible on uos branch 2020-06-04 14:01:08 +08:00
wangxuwen
76d6f406dc fixed : change the dock position will display error for bug 25873
切换任务栏位置有时候布局错乱bug 25873
2020-05-29 16:23:11 +08:00
chenwei
89644168d5 fix:The taskbar right-click menu does not tell the center to select show or not show
任务栏右键菜单中没有通知中心选择展示或不展示选项(bug25207)
2020-05-28 16:05:19 +08:00
fpc_diesel
f56b3ce846 feat(accessible):rename multitasking and show-desktop plugin
重命名任务栏左下角的回到桌面和多任务视图插件的标记命名,
对Label添加Value属性,看能不能被识别到
2020-05-08 16:25:02 +08:00
fpc_diesel
06ac0b986a feat(accessible):Unified naming && set overlaywarningwidget accessible
统一命名方式,所有的控件均以统一,添加overlaywarningwidget的accessible代码
2020-05-06 17:28:20 +08:00
wangxuwen
3498bc8d8f fixed(dde-dock): dock item display error when startup for bug 19279
修复当开机时候,lanucher会因为刷新慢导致先显示在中间,然后再显示正确位置

(cherry picked from commit 9fe0985d8365b761e9741fa43956f1a1037d0568)
2020-04-27 11:47:18 +08:00
fanpengcheng_cm
684ed7cf0b feat:set control accessible 2020-03-13 13:39:01 +08:00
wangxuwen
0889159f74 feat(dde-dock): update the datetime plugin display for bug 15631 2020-03-13 12:16:29 +08:00
王少君
9c6be185e5 Revert "feat:set cotrol accessible"
This reverts commit 5be2ade0b13a0d47cf58a27e19caf06b9f9ed377
2020-03-13 12:07:59 +08:00
fanpengcheng_cm
5be2ade0b1 feat:set cotrol accessible 2020-03-12 20:23:53 +08:00
fanpengcheng_cm
b10d849939 feat:trash plugin can uninstall app
支持在启动器全屏的时候,拖动app到任务栏的垃圾桶插件图标上提示卸载应用(修复插件不能移动位置的问题)
2020-03-09 11:06:10 +08:00
fanpengcheng_cm
0bd6a5a6d3 feat:trash plugin can uninstall app
支持在启动器全屏的时候,拖动app到任务栏的垃圾桶插件图标上提示卸载应用
2020-03-07 16:36:32 +08:00
chenzhe
a969d811b7 fix:Adding com.deepin.dde.dock.module.launcher also needs to hide the multitasking view and show the desktop icon
添加com.deepin.dde.dock.module.launcher中还需要隐藏多任务视图和显示桌面图标
2020-02-15 10:27:46 +08:00
inory_9
07a53d1c16 fix:The app is not added to the taskbar. A blank area appears in the taskbar.
拖拽应用偶尔会没有添加到任务栏,任务栏出现空白区域。(bug:12044)
2020-01-14 12:56:03 +08:00
chenzhe
d65e60c0ac fix:datatime plug Decimal conversion show incomplete
时间插件进制转换时,时间显示不全
2020-01-11 11:59:54 +08:00
chenzhe
4376f36beb fix(dde-dock):fix plugin spacing too large 2020-01-10 09:06:21 +08:00
chenzhe
6a1a795649 fix(dde-dock):Third party plug-ins are not displayed completely
第三方插件显示不全 (task:13328)
2020-01-09 19:38:28 +08:00
liuyao
69920f2bd8 feat:Forbid dragging trash to dock
添加禁止将启动器中的回收站拖入dock栏 (task:8554)
2020-01-07 11:03:21 +08:00
wangxuwen
1212175e55 feat(dde-dock): change the plugins logic for task 13189 2020-01-06 14:27:22 +08:00
wangxuwen
1ede666ea5 feat(dde-dock): change the desktop size 2019-12-24 13:09:50 +08:00
wangxuwen
5af3d29355 feat(dde-dock): add desktop function for task 12765 2019-12-23 13:48:11 +08:00
shaojun
7b88efa80f fixed(fixed plugin):save fixed plugin pos
固定区域的插件位置保存
2019-12-06 14:25:36 +08:00
wangxuwen
4d2e87f34a feat(dde-dock):change plugin item radius for task 12385 2019-12-04 11:36:27 +08:00
wangxuwen
e50f8a2128 feat(dde-dock):plugin index and prewindow display error for task 12385 2019-12-04 09:27:11 +08:00
wangxuwen
7114b79721 feat(dde-dock): change default value for dde-dock of position 2019-11-23 10:15:59 +08:00
shaojun
7c6327e215 feat(dde-dock): for task 11933 (tray size error by change mode) 2019-11-21 14:01:37 +08:00
wangxuwen
4ae94f4ba5 feat(dde-dock): for task 11933 2019-11-19 10:36:21 +08:00
wangxuwen
4a0fb2968c feat(dock):for task 11933 2019-11-18 15:19:33 +08:00
shaojun
eae9def647 feat:only control owner plugin 2019-11-04 17:22:34 +08:00
shaojun
76d9ac05fc fixed:app item pos error 2019-11-04 14:42:50 +08:00
shaojun
f8af5aaf24 feat:ajdust all dock item size 2019-10-31 15:38:56 +08:00
wangxuwen
d325a98a2b feat(dock): change the lohic for dock icon‘s size 2019-10-28 17:10:51 +08:00