81 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
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
范朋程
8fe6e16957 fix: 修复更改分辨率导致的任务栏隐藏后无法唤起问题
任务栏监听区域信息没有在分辨率切换时更新,导致分辨率修改后,监听的区域实际上已经是屏幕外部了,

Log: 设置任务栏状态为一直隐藏,调整分辨后,任务栏无法唤醒
Bug: https://pms.uniontech.com/zentao/bug-view-34444.html
2020-06-20 17:14:40 +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
范朋程
4521602879 fix(size): 修复多屏切换,从低分屏切换到高分屏时,任务栏的大小异常问题
切换到另外一个屏幕显示后,未更新任务栏的大小

Log: 修复多屏切换导致的任务栏大小显示异常问题
Bug:https://pms.uniontech.com/zentao/bug-view-32656.html
2020-06-15 16:38:50 +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
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
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
wangxuwen
1171b9c639 fixed(dde-dock): add GSettings config for bug 13911 of trash-plugin 2020-02-24 17:39:14 +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
shaojun
d4702c748c fixed:dock default value
dde-session-daemon比dock晚启动,导致dock获取的默认值错误
2019-12-02 15:01:38 +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
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
368201498a fixed(dock): fixed bug 2187 for dock display error when change position 2019-09-10 11:14:36 +08:00
wangxuwen
eced298591 feat(dock): delete invalid code for set icon size logic 2019-09-03 13:57:02 +08:00
wangxuwen
49d46ec4a1 feat(dock): modefied for dock window size for dbus change the interface 2019-09-03 13:26:42 +08:00
wangxuwen
b858029bfd feat(dock): delete icon size setting functions 2019-08-31 09:21:02 +08:00
wangxuwen
dd7ef78dba feat(dock): add window free scaling function 2019-08-26 18:08:56 +08:00
shaojun
f4089b2073 fix(mainwindow):fix bug for mainwindow pos 2019-08-23 16:58:13 +08:00
shaojun
f3d8494454 feat(mainwindow):modify mainwindow animation and position 2019-08-23 16:18:21 +08:00
王少君
854d8a68a4 feat:replace DockItemController to DockItemManager 2019-08-17 18:01:32 +08:00
justforlxz
55c4c74a82
refactor: use QWidget::devicePixelRatio to replace QApplication::devicePixelRatio
插入新屏幕后,新屏幕的缩放是1,切换为复制模式后如果继续使用QApplication::devicePixelRatio会导致
显示错误,统一换成QWidget::devicePixelRatio或QScreen::devicePixelRatio。
2019-04-23 18:27:40 +08:00
zccrs
5be4c59e51 fix: dock position and size is wrong on multiple screens and the screens have different device scale ratio
Change-Id: I751f31cf9174eea62471924771d21517936d45da
2019-03-29 16:13:38 +08:00
listenerri
176d58e9f9 fix: obtain opacity value too frequently when startup
https://github.com/linuxdeepin/internal-discussion/issues/858

Change-Id: I71b82e2ecebe1a3f9437403d2ee90df7c42d0c08
2019-01-16 11:10:34 +08:00
listenerri
945d58a4b5 refactor: using libdframeworkdbus for dock dbus daemon
Change-Id: I62531c101075ec9b37d3840be97bbba25c9faab4
2019-01-07 14:09:25 +08:00
listenerri
b696c4daf2 refactor: rename system-tray to tray
Change-Id: Ic5fcbb85851aebb490ab633b355d77fa3d578914
2018-11-20 14:04:16 +08:00
listenerri
738f41aa17 fix: resize dock and fashion system tray recursively
Change-Id: I988712e6f6081ddecf48207f9ed93096ff5598c2
2018-11-12 10:42:07 +08:00
listenerri
e9c48fb2f0 refactor(system-tray): new fashion system tray
Change-Id: I7d359c1a33fbb32bc174026e7aee130d328313ef
2018-10-22 10:06:12 +08:00
haruyukilxz
0310a31352 feat: support change frame opacity
Change-Id: I5d20a2736e70097b357a9c4e51befd5e7c135878
2018-10-10 09:09:14 +08:00
haruyukilxz
4dcb1d9c4f feat: add dock settings instance
Change-Id: I8d09c2d0e986de1493ad9dc43a2eeaffe3014746
2018-07-30 15:12:51 +08:00
石博文
133b711d1f update license
Change-Id: I9df92e43b79f7c2b3688b595f80df7b3a7bb7ed2
2018-02-07 11:52:47 +08:00
石博文
7cdec93fb9 disable shadow effect
Change-Id: I9903bd013a764ff3b6f790f6bd7e2ccdf50ef93f
2018-01-04 18:21:30 +08:00
石博文
f06ebc7c65 refactor: optimize dock show animation behavior
Change-Id: Ia82bde6eeebf9a1d0e64602fe6a85c6a72d9548e
2018-01-02 16:48:01 +08:00
石博文
d17b1661b1 fix window redius
Change-Id: I0a6492d288830e3331d69ced357677a6f636f8a9
2018-01-02 14:08:10 +08:00
石博文
4f4098f891 add position check logs
Change-Id: I5f276f46a554c5355838530e9e1f0f537a190d26
2017-12-13 13:07:39 +08:00