147 Commits

Author SHA1 Message Date
tsic404
9de057e2cc refactor: add taskmanager from dde-application-manager
1. taskmanager used to identify which entry should map to window
  in x11 environmrnt, listen to xevent in anohter thread, and handle those event
when window create, destory, changed. use some way to identify which entry(desktopfile)
should mapped to changed window.
  in wayland, connected plsamawindow signal(window created destoried.
2. use taskmanager instead of dbus in old dock code

log: as title
2023-07-18 07:35:19 +00:00
tsic404
5f6cacdf2a refactor: Rewrite the calling method of dock settings
Rewrite the calling method of dock settings, using the new dconfig interface instead of AM's dbus interface

log: as title
2023-07-18 07:35:19 +00:00
tsic404
eb33819302 refactor: rewrite encapsulation of the dconfig
log: as title
2023-07-18 07:35:19 +00: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
yexin
9fd43e1c4d feat(multitaskingplugin): 多任务视图优化需求
当前设备不支持特效就不显示多任务视图和右键插件

Log: 当前设备不支持特效就不显示多任务视图和右键插件
Task: https://pms.uniontech.com/zentao/task-view-30901.html
Change-Id: Ief4b654831d20056072a160759b08a0c7af30f5c
Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/875
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 14:36:18 +08:00
范朋程
96b4330e02 fix: 修复切换分辨率后任务栏显示大小异常的问题
在分辨率发生变化,应该优先更新屏幕的大小信息再根据这些信息及计算出任务栏的位置,代码里逻辑是反的

Log: 修复切换分辨率后任务栏显示大小异常的问题
Bug: https://pms.uniontech.com/zentao/bug-view-36796.html
2020-07-07 17:42:05 +08:00
zhaolong
00e6e2d6fb fix(frame): 动画在多屏情况下异常
多屏条件下添加了较多功能,而这些功能发生时改变了dock的一些状态,且这些状态有些有相叠的情况,所以删除了一些状态值,也另添了一些状态值来区分不同情况

Log: 修复任务栏在多屏情况下的一些异常
Bug: https://pms.uniontech.com/zentao/bug-view-34468.html
Bug: https://pms.uniontech.com/zentao/bug-view-34458.html
Bug: https://pms.uniontech.com/zentao/bug-view-34454.html
Bug: https://pms.uniontech.com/zentao/bug-view-33736.html
Bug: https://pms.uniontech.com/zentao/bug-view-33718.html
Bug: https://pms.uniontech.com/zentao/bug-view-33693.html
Bug: https://pms.uniontech.com/zentao/bug-view-32105.html
2020-06-23 19:35:44 +08:00
范朋程
74475ecf86 fix: 修复任务栏各种无法唤醒和显示错位问题
任务栏无法唤醒基本都是因为监听的屏幕区域没有在屏幕大小和坐标发生变化的时候及时更新信息,
显示错位是因为动画完成后内部有些变量未更新导致的,

Log: 修复任务栏隐藏后切换位置或者调整屏幕无法唤起和显示到屏幕外部的问题
Bug: https://pms.uniontech.com/zentao/bug-view-34468.html
Bug: https://pms.uniontech.com/zentao/bug-view-34467.html
Bug: https://pms.uniontech.com/zentao/bug-view-34458.html
Bug: https://pms.uniontech.com/zentao/bug-view-34454.html
Bug: https://pms.uniontech.com/zentao/bug-view-34444.html
Bug: https://pms.uniontech.com/zentao/bug-view-34437.html
Bug: https://pms.uniontech.com/zentao/bug-view-34340.html
Bug: https://pms.uniontech.com/zentao/bug-view-33718.html
Bug: https://pms.uniontech.com/zentao/bug-view-33693.html
Bug: https://pms.uniontech.com/zentao/bug-view-32854.html
Bug: https://pms.uniontech.com/zentao/bug-view-32849.html
Bug: https://pms.uniontech.com/zentao/bug-view-32830.html
2020-06-22 14:03:18 +08:00
范朋程
ea67db4aa6 fix: 修复任务栏各种无法唤醒和显示错位问题
任务栏无法唤醒基本都是因为监听的屏幕区域没有在屏幕大小和坐标发生变化的时候及时更新信息,
显示错位是因为动画完成后内部有些变量未更新导致的,

Log: 修复任务栏隐藏后切换位置或者调整屏幕无法唤起和显示到屏幕外部的问题
Bug: https://pms.uniontech.com/zentao/bug-view-34468.html
Bug: https://pms.uniontech.com/zentao/bug-view-34467.html
Bug: https://pms.uniontech.com/zentao/bug-view-34458.html
Bug: https://pms.uniontech.com/zentao/bug-view-34454.html
Bug: https://pms.uniontech.com/zentao/bug-view-34444.html
Bug: https://pms.uniontech.com/zentao/bug-view-34437.html
Bug: https://pms.uniontech.com/zentao/bug-view-34340.html
Bug: https://pms.uniontech.com/zentao/bug-view-33718.html
Bug: https://pms.uniontech.com/zentao/bug-view-33693.html
Bug: https://pms.uniontech.com/zentao/bug-view-32854.html
Bug: https://pms.uniontech.com/zentao/bug-view-32849.html
Bug: https://pms.uniontech.com/zentao/bug-view-32830.html
2020-06-21 17:51:23 +08:00
范朋程
8fe6e16957 fix: 修复更改分辨率导致的任务栏隐藏后无法唤起问题
任务栏监听区域信息没有在分辨率切换时更新,导致分辨率修改后,监听的区域实际上已经是屏幕外部了,

Log: 设置任务栏状态为一直隐藏,调整分辨后,任务栏无法唤醒
Bug: https://pms.uniontech.com/zentao/bug-view-34444.html
2020-06-20 17:14:40 +08:00
zhaolong
5207090044 fix(frame): 双屏对角拼接时切换位置后鼠标不能唤起
任务栏通过菜单唤起后未能重新计算屏幕可停靠位置

Log: 修复双屏对角拼接时切换任务栏位置后鼠标不能唤起任务栏
Task: https://pms.uniontech.com/zentao/task-view-27393.html
2020-06-20 00:32:41 +08:00
zhaolong
1e4669c549 fix(frame): 无特效时任务栏不能唤起
屏幕分辨率改变后dock大小未设置,另在屏幕边缘处会循环触发

Log: 修复2D模式下,设置任务栏状态为智能隐藏后,移开窗口和鼠标放置任务栏位置均不能唤醒任务栏
Bug: https://pms.uniontech.com/zentao/bug-view-33639.html
2020-06-20 00:19:46 +08:00
zhaolong
18191155f3 fix(frame): 动画在多屏情况下异常
多屏条件下添加了较多功能,而这些功能发生时改变了dock的一些状态,且这些状态有些有相叠的情况,所以删除了一些状态值,也另添了一些状态值来区分不同情况

Log: 修复任务栏在多屏情况下的一些异常
Bug: https://pms.uniontech.com/zentao/bug-view-33736.html
Bug: https://pms.uniontech.com/zentao/bug-view-33718.html
Bug: https://pms.uniontech.com/zentao/bug-view-33693.html
Bug: https://pms.uniontech.com/zentao/bug-view-33639.html
Bug: https://pms.uniontech.com/zentao/bug-view-33636.html
Bug: https://pms.uniontech.com/zentao/bug-view-32919.html
Bug: https://pms.uniontech.com/zentao/bug-view-32830.html
Bug: https://pms.uniontech.com/zentao/bug-view-34173.html
2020-06-19 09:04:41 +08:00
zhaolong
fbd08071a4 fix(frame): 多屏齐接时衔接处闪烁
dock做收缩动画时求取dock的位置非当前屏,而是计算后可停靠dock的屏

Log: 修复多屏对齐拼接条件下,调整dock位置时会在衔接处闪烁的问题
Bug: https://pms.uniontech.com/zentao/bug-view-29144.html
2020-06-16 18:03:10 +08:00
范朋程
ee83bb1cba fix(cppcheck): cppcheck检查
静态代码检查,按照提示修改了所有合理的警告内容,部分内容为cppcheck误报,不处理

Log: 按照静态代码检查工具给出的结果进行修改
2020-06-16 13:54:23 +08:00
zhaolong
44cf2dd47d fix(frame): 动画异常
旧代码动画实现方式是采用延时触发,以设定的300毫秒动画时间为参照,动画相关的功能逻辑均是或先于或晚于该时间执行,当遇到机器运算较慢,或瞬时CPU负荷较重时,程序地执行流程会出现紊乱,而背离预期行为,出现一些特定情况下BUG,且难以分析,复现和调试。现删除所有以特定时间为先后顺序,来控制动画相关功能实现方式,改为以事件结束为依据地触发方式

Log: 修复dock栏位置和显示都出错的问题
Bug: https://pms.uniontech.com/zentao/bug-view-12178.html
Bug: https://pms.uniontech.com/zentao/bug-view-25873.html
Task: https://pms.uniontech.com/zentao/task-view-25153.html
Bug: https://pms.uniontech.com/zentao/bug-view-28993.html
2020-06-13 13:38:13 +08:00
zhaolong
35e21caf48 fix(frame): 对齐拼接屏衔接处不可放置任务栏
以计算过的是否可放位置,判断一下之后再决定是否移动

Log: 修复任务栏不可以在两个屏幕中间的问题
Bug: https://pms.uniontech.com/zentao/bug-view-27070.html
2020-06-11 18:17:40 +08:00
zhaolong
fd823f5383 fix(frame): 多屏对角拼接时任务栏消失
在对角位错位时原有代码判断失效,现加上判断对角情况,另修改上下判断出错问题

Log: 修复多屏条件下两个显示器成对角拼接时,调整任务栏为最左或最右后,任务栏消失问题
Bug: https://pms.uniontech.com/zentao/bug-view-27364.html
2020-06-11 16:10:13 +08:00
zhaolong
6a97c67ddf fix(frame): 代码合并错误
以下提交在代码合入时冲突,解决冲突时采用了旧代码,导致多屏失效问题

Log: 修复代码合并采用旧代码导致多屏失效问题
2020-06-09 16:35:38 +08:00
范朋程
ac6a590b37 Merge tag '5.1.0.12' into uos
# Conflicts:
#	frame/util/docksettings.cpp
#	frame/util/docksettings.h
#	frame/window/mainwindow.cpp
2020-06-05 17:17:36 +08:00
范朋程
01d7a23d02 Merge tag '5.1.0.11' into uos
dde 5.0.0.3

# Conflicts:
#	frame/util/docksettings.cpp
#	frame/util/docksettings.h
#	frame/window/mainwindow.cpp
#	gschema/com.deepin.dde.dock.module.gschema.xml
2020-06-05 16:15:42 +08:00
zhaolong
f1ac619557 feat(frame):dock moves with the mouse to the corresponding screen
多屏扩展模式下桌面-任务栏显示,当鼠标贴近屏幕顶部/底部边缘时,移动任务栏显示到当前屏幕task:18770
2020-05-29 15:45:39 +08:00
fpc_diesel
f019e29eee Revert "feat(frame):multi-screen down taskbar location"
This reverts commit 634265aec4cf351c5a112f95e14c445fb68817ab.

# Conflicts:
#	frame/util/docksettings.cpp
2020-05-23 10:14:31 +08:00
fpc_diesel
5469493e26 Merge branch 'maintain/5.1.1' into uos
# Conflicts:
#	frame/main.cpp
#	frame/util/docksettings.cpp
2020-05-14 11:26:35 +08:00
zhaolong
634265aec4 feat(frame):multi-screen down taskbar location
多屏扩展模式下桌面任务栏显示,在调整屏幕拼接位置或多屏扩展模式时下dock位置与以相应变化 task:18769 18771

(cherry picked from commit 5eb654e1c7f3349a1be6230a535cedc01b9d0540)

# Conflicts:
#	frame/util/docksettings.h
#	frame/window/mainwindow.cpp
#	frame/window/mainwindow.h
2020-05-13 13:47:40 +08:00
zhaolong
d0287da737 feat(frame):multi-screen down taskbar location
多屏扩展模式下桌面任务栏显示,在调整屏幕拼接位置或多屏扩展模式时下dock位置与以相应变化 task:18769 18771

(cherry picked from commit 5eb654e1c7f3349a1be6230a535cedc01b9d0540)
2020-05-11 11:21:17 +08:00
fpc_diesel
06ac0b986a feat(accessible):Unified naming && set overlaywarningwidget accessible
统一命名方式,所有的控件均以统一,添加overlaywarningwidget的accessible代码
2020-05-06 17:28:20 +08:00
wangxuwen
df819075e3 fix: fix the dock sometimes can not show for bug 23580
23580 【桌面专业版】【曙光】【Hygon C86 3185】【W330-H35】【uos 20 20200327 x86_64】屏幕多次锁屏打开后任务栏消失
2020-04-30 15:12:25 +08:00
fanpengcheng_cm
684ed7cf0b feat:set control accessible 2020-03-13 13:39:01 +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
wangxuwen
1171b9c639 fixed(dde-dock): add GSettings config for bug 13911 of trash-plugin 2020-02-24 17:39:14 +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
wangxuwen
5422441836 fixed (dde-dock): dde-dock can not hide really for task 14309 2020-02-12 17:32:46 +08:00
chenzhe
c305f89037 feat:add com.deepin.dde.dock.module.menu control menu show/hide
添加 com.deepin.dde.dock.module.menu 服务控制dock右键菜单不弹出(task:13652)
2020-01-19 18:25:05 +08:00
wangxuwen
c841e462fd fixed(dde-dock): change the plugins sort for bug 10319 2020-01-11 10:35:29 +08:00
shaojun
d4702c748c fixed:dock default value
dde-session-daemon比dock晚启动,导致dock获取的默认值错误
2019-12-02 15:01:38 +08:00
shaojun
2994f04022 feat(plugin):show date min height 2019-11-19 11:27:10 +08:00
wangxuwen
bb45462b3c feat(dde-dock): save windowsize value 2019-11-15 14:18:05 +08:00
wangxuwen
71998ed9ac feat(dde-dock):change window size logic for task 11865 2019-11-15 13:50:27 +08:00
shaojun
a4a9430f3a fixed:remove custom menu 2019-11-12 18:55:27 +08:00
shaojun
357b141594 feat(tray):add method and signal to tray item count 2019-10-29 15:07:56 +08:00
wangxuwen
0301ff4fa6 feat(dde-dock): 设置dock大小实现云同步 2019-10-08 15:40:04 +08:00
shaojun
a1334208d7 fixed(bug:3176):refresh item icon when screen changed. 2019-09-27 09:34:30 +08:00
shaojun
27e7204375 fixed(dock):pos and animation modify 2019-09-25 14:09:02 +08:00
wangxuwen
2b3b52bbe8 fixed(dock): fixed bug 1979 2019-09-20 16:05:22 +08:00
wangxuwen
212103100b fixed(dock): fix bug 2697 2019-09-19 14:43:08 +08:00
wangxuwen
981c0fde25 feat(dock): delete mainpanel.cpp and mainpanel.h 2019-09-10 11:29:56 +08:00
wangxuwen
368201498a fixed(dock): fixed bug 2187 for dock display error when change position 2019-09-10 11:14:36 +08:00
wangxuwen
d77226cb6d feat(dock): the dock size will be change to default value when change
the mode
2019-09-05 20:16:43 +08:00