From 6b5f1b4adeeb7397ce15fe76dda935698883121e Mon Sep 17 00:00:00 2001
From: Gregory Schier <gschier1990@gmail.com>
Date: Mon, 20 Mar 2023 13:34:49 -0700
Subject: [PATCH] Fix pointer window drag

---
 src-tauri/icons/icon.icns                     | Bin 616124 -> 616124 bytes
 .../components/RequestSettingsDropdown.tsx    |  11 +++++++----
 src-web/components/Workspace.tsx              |  14 +++++---------
 src-web/components/core/Editor/Editor.css     |   2 +-
 tailwind.config.cjs                           |   1 +
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src-tauri/icons/icon.icns b/src-tauri/icons/icon.icns
index 05cd9cf2770f49f675ae703bc6a3a0dee4089cab..6b22e09723c454446c3fe03ff5410f4feac0294e 100644
GIT binary patch
delta 97
zcmdmUR&~!=Ri4b`ykZ8<v^|;0hQ`|+)0lTJ+isV}Tr`)_q-{Clw&hHpmbL#|#<>08
zGN!M~+Dq5505K~NvjH*t_R@76^K!R;^kw#!*uF!Hlf`EHZypv7mhHkaoQwDX9JDBR

delta 99
zcmdmUR&~!=Ri4b`ykZ8<v^|;0h9>QLubH;%y=MNjtX&7l(s|ANb=mfV|2cdmHlJKp
zFn4qHTp!Nu!XcdOEE_qC=C&(NVgX`SAZ7z%_U($3IOgSUmx|zA#J8PWf|K0_09v&t
AJOBUy

diff --git a/src-web/components/RequestSettingsDropdown.tsx b/src-web/components/RequestSettingsDropdown.tsx
index fa2f5942..5b01ec4f 100644
--- a/src-web/components/RequestSettingsDropdown.tsx
+++ b/src-web/components/RequestSettingsDropdown.tsx
@@ -1,11 +1,14 @@
-import { memo } from 'react';
 import { useActiveRequestId } from '../hooks/useActiveRequestId';
 import { useDeleteRequest } from '../hooks/useDeleteRequest';
 import { Dropdown } from './core/Dropdown';
 import { Icon } from './core/Icon';
 import { IconButton } from './core/IconButton';
 
-export const RequestSettingsDropdown = memo(function RequestSettingsDropdown() {
+interface Props {
+  className?: string;
+}
+
+export function RequestSettingsDropdown({ className }: Props) {
   const activeRequestId = useActiveRequestId();
   const deleteRequest = useDeleteRequest(activeRequestId ?? null);
   return (
@@ -24,7 +27,7 @@ export const RequestSettingsDropdown = memo(function RequestSettingsDropdown() {
         },
       ]}
     >
-      <IconButton size="sm" title="Request Options" icon="gear" />
+      <IconButton className={className} size="sm" title="Request Options" icon="gear" />
     </Dropdown>
   );
-});
+}
diff --git a/src-web/components/Workspace.tsx b/src-web/components/Workspace.tsx
index 3c2ec138..cbde2cf8 100644
--- a/src-web/components/Workspace.tsx
+++ b/src-web/components/Workspace.tsx
@@ -37,26 +37,22 @@ export default function Workspace() {
   return (
     <div className="grid grid-cols-[auto_1fr] grid-rows-1 h-full text-gray-900">
       <Sidebar />
-      <div
-        ref={mainContentRef}
-        data-tauri-drag-region
-        className="grid grid-rows-[auto_minmax(0,1fr)] h-full"
-      >
+      <div ref={mainContentRef} className="grid grid-rows-[auto_minmax(0,1fr)] h-full">
         <HStack
           as={WindowDragRegion}
           justifyContent="center"
-          className="pointer-events-none px-3 bg-gray-50 text-gray-900 border-b border-b-gray-200 pt-[1px]"
+          className="px-3 bg-gray-50 text-gray-900 border-b border-b-gray-200 pt-[1px]"
           alignItems="center"
         >
           <div className="flex-1 -ml-2 pointer-events-none">
             <WorkspaceDropdown className="pointer-events-auto" />
           </div>
-          <div className="flex-[2] text-center text-gray-700 text-sm truncate">
+          <div className="flex-[2] text-center text-gray-700 text-sm truncate pointer-events-none">
             {activeRequest?.name}
           </div>
-          <div className="flex-1 flex justify-end -mr-2">
+          <div className="flex-1 flex justify-end -mr-2 pointer-events-none">
             <IconButton size="sm" title="" icon="magnifyingGlass" />
-            <RequestSettingsDropdown />
+            <RequestSettingsDropdown className="pointer-events-auto" />
           </div>
         </HStack>
         <div
diff --git a/src-web/components/core/Editor/Editor.css b/src-web/components/core/Editor/Editor.css
index 03c5025e..9fae015d 100644
--- a/src-web/components/core/Editor/Editor.css
+++ b/src-web/components/core/Editor/Editor.css
@@ -29,7 +29,7 @@
             @apply bg-transparent;
         }
         &.cm-focused .cm-selectionBackground {
-            @apply bg-violet-500/20;
+            @apply bg-selection;
         }
 
         /* Style gutters */
diff --git a/tailwind.config.cjs b/tailwind.config.cjs
index 22f7b83c..6453a953 100644
--- a/tailwind.config.cjs
+++ b/tailwind.config.cjs
@@ -29,6 +29,7 @@ module.exports = {
       "5xl": "3.052rem"
     },
     colors: {
+      selection: "hsl(var(--color-violet-500) / 0.4)",
       focus: "hsl(var(--color-blue-500) / 0.6)",
       invalid: "hsl(var(--color-red-500))",
       highlight: "hsl(var(--color-gray-200) / 0.3)",