Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-04 17:33:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,208 Commits 3 Branches 655 Tags
Commit Graph

129 Commits

Author SHA1 Message Date
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
wangxuwen
bbfdee3a4d feat(dock): setting window size function behind update window function 2019-09-04 11:50:01 +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
shaojun
4dbaf87af6 fix(docksetting): change method for dock default height 2019-09-03 10:19:59 +08:00
wangxuwen
b858029bfd feat(dock): delete icon size setting functions 2019-08-31 09:21:02 +08:00
wangxuwen
0a5fd622db feat(dock): change frame for mode changed 2019-08-30 13:17:01 +08:00
wangxuwen
c8b30c3fe4 feat(dock): add left and right side expansion function 2019-08-30 10:41:39 +08:00
shaojun
68d5c279db feat(docksetting):trash alaways display 2019-08-29 14:52:04 +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
wangxuwen
dc3e3e0b6a feat(dock): add visualization window 2019-08-22 18:08:41 +08:00
王少君
854d8a68a4 feat:replace DockItemController to DockItemManager 2019-08-17 18:01:32 +08:00
justforlxz
e15f882330
refactor: delete unwanted border values 
WINDOW_OVERFLOW
在d17b1661b13482fad66e3888aaa0f843ea2fa013提交中开始使用，现在发现不需要删除window
redius导致的边框距离了，所以删除这个值，避免影响dock中对rect的计算。
 2019-05-06 15:30:13 +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
listenerri
7338d8fb83 not show trash in plugins context menu under efficient mode 
https://github.com/linuxdeepin/internal-discussion/issues/1271
 2019-04-11 18:00:21 +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