Merge branch 'next-windows' of https://github.com/ItsEeleeya/Cap into…

… next-windows
CapSoftware · Nov 16, 2024 · 9a49e34 · 9a49e34
2 parents ec02aef + 73f96c8
commit 9a49e34
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/apps/desktop/src/components/titlebar/controls/CaptionControlsWindows11.tsx b/apps/desktop/src/components/titlebar/controls/CaptionControlsWindows11.tsx
@@ -1,4 +1,4 @@
-import { ComponentProps, createEffect, JSX, Show, splitProps } from "solid-js";
+import { ComponentProps, JSX, Show, splitProps } from "solid-js";
 import { WindowControlButton as ControlButton } from "./WindowControlButton";
 import { getCurrentWindow } from "@tauri-apps/api/window";
 import titlebarState from "~/utils/titlebar-state";
@@ -8,10 +8,6 @@ export default function (props: ComponentProps<"div">) {
   const [local, otherProps] = splitProps(props, ["class"]);
   const window = getCurrentWindow();
 
-  createEffect(() => {
-    console.log(`Maximizable? ${titlebarState.maximizable}`);
-  });
-
   return (
     <div
       class={`h-full align-baseline select-none *:outline-none *:transition-all *:duration-200 ${local.class}`}

diff --git a/apps/desktop/src/routes/(window-chrome)/settings.tsx b/apps/desktop/src/routes/(window-chrome)/settings.tsx
@@ -66,7 +66,7 @@ export default function Settings(props: RouteSectionProps) {
           </Button>
         </div>
       </div>
-      <div class="flex-1 bg-gray-50 overflow-y-hidden animate-in !scrollbar-thin">
+      <div class="flex-1 bg-gray-50 overflow-y-hidden animate-in">
         <Suspense>{props.children}</Suspense>
       </div>
     </div>