From 9abe918ad4cfb109a561453909d4fa36014837da Mon Sep 17 00:00:00 2001 From: guerler Date: Thu, 11 Apr 2024 10:25:02 +0300 Subject: [PATCH 1/2] Add activity bar divider between footer and main activities --- client/src/components/ActivityBar/ActivityBar.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/client/src/components/ActivityBar/ActivityBar.vue b/client/src/components/ActivityBar/ActivityBar.vue index 0e2c54e7b181..3163e81cd373 100644 --- a/client/src/components/ActivityBar/ActivityBar.vue +++ b/client/src/components/ActivityBar/ActivityBar.vue @@ -197,7 +197,7 @@ watch( - + Date: Wed, 17 Apr 2024 15:00:09 +0300 Subject: [PATCH 2/2] Add drag delay to avoid conflict with click handler --- client/src/components/ActivityBar/ActivityBar.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/client/src/components/ActivityBar/ActivityBar.vue b/client/src/components/ActivityBar/ActivityBar.vue index 3163e81cd373..40baad944a5a 100644 --- a/client/src/components/ActivityBar/ActivityBar.vue +++ b/client/src/components/ActivityBar/ActivityBar.vue @@ -23,6 +23,9 @@ import NotificationsPanel from "@/components/Panels/NotificationsPanel.vue"; import SettingsPanel from "@/components/Panels/SettingsPanel.vue"; import ToolPanel from "@/components/Panels/ToolPanel.vue"; +// require user to long click before dragging +const DRAG_DELAY = 50; + const { config, isConfigLoaded } = useConfig(); const route = useRoute(); @@ -150,6 +153,7 @@ watch( :class="{ 'activity-popper-disabled': isDragging }" :force-fallback="true" chosen-class="activity-chosen-class" + :delay="DRAG_DELAY" drag-class="activity-drag-class" ghost-class="activity-chosen-class" @start="isDragging = true"