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 |
|
石博文
|
43280afa57
|
forbid dock placed betweens screens
Change-Id: I869c2ba23f61a72790eb37cb1554aa08850f5aa3
|
2017-12-13 11:53:03 +08:00 |
|
石博文
|
aff00a7f79
|
fix preview stat not quit
Change-Id: I0e79d8277edee5ae6ebf0bc70196560d077e74a2
|
2017-11-20 14:46:56 +08:00 |
|
石博文
|
84b880384b
|
fix strut error
Change-Id: Id983c0aaf6c8e07329c9dd9b2d66eb46520facff
|
2017-11-14 15:18:33 +08:00 |
|
石博文
|
acd2180fa8
|
using platform window to set geometry
Change-Id: I3fcf7c9da69fccf31fa9159969bc8ff3052457b0
|
2017-11-14 11:07:29 +08:00 |
|
石博文
|
ae785f6f9a
|
add new plugin interface to allow disable plugin
Change-Id: I44ee961151f05bf98c332d28088938bda544740e
|
2017-10-23 10:06:36 +08:00 |
|
石博文
|
71ccbcef83
|
update license
Change-Id: I90da53ccbbd08d5195469fdfe6ff98fc630d0b34
|
2017-09-18 14:33:44 +08:00 |
|
Hualet Wang
|
395cd66b23
|
Remove dependency on gtk
Change-Id: Ic87401a0c7f192951fcdb86cd45bf1f870e06779
|
2017-02-16 10:23:46 +08:00 |
|
Felix Yan
|
cad692b40a
|
Fix some typos: *Chanegd -> *Changed
Change-Id: I81970f0c3b6abe46a672e8f49936a9d2f0263d64
|
2017-02-07 16:45:44 +08:00 |
|
Hualet Wang
|
6872bb4d0b
|
Make QMenu DMenu-style, and white only
Change-Id: Ideedc2d9b1f36b7c958194891756330530e7925b
|
2016-12-30 16:30:09 +08:00 |
|
石博文
|
2322a058b3
|
replace dmenu with qmenu
Change-Id: Ifefc6e6c65e91c98e446bcf16f1688b05fc26b95
|
2016-12-12 10:58:48 +08:00 |
|
石博文
|
adcc57e7cb
|
save auto expand delay settings to backend
Change-Id: Ie86fddb259ba49678026112f6482bd4424bfeeaa
|
2016-09-06 11:31:03 +08:00 |
|
石博文
|
a6e3a9b15b
|
fix dock cant shown
Change-Id: Ic5171acbf87b18ac4acb7a2f28517bd809a53b00
|
2016-08-31 11:23:07 +08:00 |
|
石博文
|
47bbc404a7
|
refersh icon when gtk icon theme changed
Change-Id: Ice7500f6526dc04d8a920c301dc3f08c9d1eb6b3
|
2016-08-18 15:20:10 +08:00 |
|