From 9151820843f12ea34db5e60d64795b2be1a2fb29 Mon Sep 17 00:00:00 2001
From: Youwes09 <yuvi.shen@outlook.com>
Date: Wed, 1 Apr 2026 11:09:40 -0500
Subject: [PATCH] Fix: TitleBar Issue (WIP) & Allow Sources in Content Settings

---
 src/App.svelte                        |  2 +-
 src/components/layout/TitleBar.svelte | 69 ++++++++++++++++++++-------
 src/components/pages/Discover.svelte  |  5 +-
 src/components/pages/Search.svelte    | 10 ++--
 src/lib/util.ts                       | 23 +++++++++
 5 files changed, 84 insertions(+), 25 deletions(-)

diff --git a/src/App.svelte b/src/App.svelte
index de9e061..da46795 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -339,7 +339,7 @@
       <SplashScreen mode="idle" showCards={store.settings.splashCards ?? true}
         onDismiss={() => { idle = false; resetIdle(); }} />
     {/if}
-    {#if !store.activeChapter && !store.isFullscreen}<TitleBar />{/if}
+    {#if !store.activeChapter}<TitleBar />{/if}
     <div class="content">
       {#if store.activeChapter}<Reader />{:else}<Layout />{/if}
     </div>
diff --git a/src/components/layout/TitleBar.svelte b/src/components/layout/TitleBar.svelte
index b7d3b35..12da2b6 100644
--- a/src/components/layout/TitleBar.svelte
+++ b/src/components/layout/TitleBar.svelte
@@ -3,8 +3,10 @@
   import { getCurrentWindow } from "@tauri-apps/api/window";
   import { platform } from "@tauri-apps/plugin-os";
 
-  const win   = getCurrentWindow();
-  const isMac = platform() === "macos";
+  const win      = getCurrentWindow();
+  const os       = platform();
+  const isMac    = os === "macos";
+  const isWindows = os === "windows";
 
   let isFullscreen = $state(false);
 
@@ -18,19 +20,39 @@
 </script>
 
 {#if !isFullscreen}
-<div class="bar" data-tauri-drag-region>
-  {#if isMac}<div class="mac-spacer"></div>{/if}
-  <span class="title" data-tauri-drag-region>Moku</span>
-  {#if !isMac}
-  <div class="controls">
-    <button onclick={() => win.minimize()} title="Minimize" aria-label="Minimize">
-      <svg width="10" height="1" viewBox="0 0 10 1">
-        <line x1="0" y1="0.5" x2="10" y2="0.5" stroke="currentColor" stroke-width="1.5" />
-      </svg>
-    </button>
-    <button onclick={() => win.toggleMaximize()} title="Maximize" aria-label="Maximize">
-      <svg width="9" height="9" viewBox="0 0 9 9">
-        <rect x="0.75" y="0.75" width="7.5" height="7.5" rx="1" fill="none" stroke="currentColor" stroke-width="1.5" />
+  <div class="bar" data-tauri-drag-region>
+    {#if isMac}<div class="mac-spacer"></div>{/if}
+    <span class="title" data-tauri-drag-region>Moku</span>
+    {#if !isMac}
+      <div class="controls">
+        <button onclick={() => win.minimize()} title="Minimize" aria-label="Minimize">
+          <svg width="10" height="1" viewBox="0 0 10 1">
+            <line x1="0" y1="0.5" x2="10" y2="0.5" stroke="currentColor" stroke-width="1.5" />
+          </svg>
+        </button>
+        <button onclick={() => win.toggleMaximize()} title="Maximize" aria-label="Maximize">
+          <svg width="9" height="9" viewBox="0 0 9 9">
+            <rect x="0.75" y="0.75" width="7.5" height="7.5" rx="1" fill="none" stroke="currentColor" stroke-width="1.5" />
+          </svg>
+        </button>
+        <button class="close" onclick={() => win.close()} title="Close" aria-label="Close">
+          <svg width="10" height="10" viewBox="0 0 10 10">
+            <line x1="1" y1="1" x2="9" y2="9" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" />
+            <line x1="9" y1="1" x2="1" y2="9" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" />
+          </svg>
+        </button>
+      </div>
+    {/if}
+  </div>
+{:else if isWindows}
+  <!-- On Windows, fullscreen hides the native titlebar — show a hoverable overlay so the user isn't locked in -->
+  <div class="fullscreen-controls">
+    <button onclick={() => win.setFullscreen(false)} title="Exit Fullscreen" aria-label="Exit Fullscreen">
+      <svg width="10" height="10" viewBox="0 0 10 10">
+        <polyline points="1,4 1,1 4,1" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+        <polyline points="6,1 9,1 9,4" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+        <polyline points="9,6 9,9 6,9" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+        <polyline points="4,9 1,9 1,6" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
       </svg>
     </button>
     <button class="close" onclick={() => win.close()} title="Close" aria-label="Close">
@@ -40,11 +62,24 @@
       </svg>
     </button>
   </div>
-  {/if}
-</div>
 {/if}
 
 <style>
+  .fullscreen-controls {
+    position: fixed;
+    top: 0;
+    right: 0;
+    z-index: 9999;
+    display: flex;
+    align-items: center;
+    gap: 2px;
+    padding: 4px;
+    opacity: 0;
+    transition: opacity 0.2s ease;
+    -webkit-app-region: no-drag;
+  }
+  .fullscreen-controls:hover { opacity: 1; }
+
   .bar {
     display: flex;
     align-items: center;
diff --git a/src/components/pages/Discover.svelte b/src/components/pages/Discover.svelte
index 0337f82..6283f5d 100644
--- a/src/components/pages/Discover.svelte
+++ b/src/components/pages/Discover.svelte
@@ -4,7 +4,7 @@
   import { gql, thumbUrl } from "../../lib/client";
   import { GET_SOURCES, FETCH_SOURCE_MANGA, UPDATE_MANGA, GET_CATEGORIES, CREATE_CATEGORY, UPDATE_MANGA_CATEGORIES } from "../../lib/queries";
   import { cache, CACHE_KEYS } from "../../lib/cache";
-  import { dedupeSources, dedupeMangaByTitle, dedupeMangaById, shouldHideNsfw } from "../../lib/util";
+  import { dedupeSources, dedupeMangaByTitle, dedupeMangaById, shouldHideNsfw, shouldHideSource } from "../../lib/util";
   import { store, setPreviewManga, clearDiscoverCache } from "../../store/state.svelte";
   import type { Manga, Source, Category } from "../../lib/types";
   import ContextMenu from "../shared/ContextMenu.svelte";
@@ -69,7 +69,8 @@
 
   function rotatedSources(): Source[] {
     const lang = store.settings.preferredExtensionLang || "en";
-    const srcs = dedupeSources(allSources.filter(s => s.id !== "0"), lang);
+    const eligible = allSources.filter(s => s.id !== "0" && !shouldHideSource(s, store.settings));
+    const srcs = dedupeSources(eligible, lang);
     if (!srcs.length) return [];
     const off = store.discoverSrcOffset % srcs.length;
     return [...srcs.slice(off), ...srcs.slice(0, off)];
diff --git a/src/components/pages/Search.svelte b/src/components/pages/Search.svelte
index 06d11ea..d72cb85 100644
--- a/src/components/pages/Search.svelte
+++ b/src/components/pages/Search.svelte
@@ -3,7 +3,7 @@
   import { gql, thumbUrl } from "../../lib/client";
   import { GET_SOURCES, FETCH_SOURCE_MANGA } from "../../lib/queries";
   import { cache, CACHE_KEYS, getPageSet } from "../../lib/cache";
-  import { dedupeSources, dedupeMangaById, dedupeMangaByTitle, shouldHideNsfw } from "../../lib/util";
+  import { dedupeSources, dedupeMangaById, dedupeMangaByTitle, shouldHideNsfw, shouldHideSource } from "../../lib/util";
   import { store, setSearchPrefill, setPreviewManga } from "../../store/state.svelte";
   import type { Manga, Source } from "../../lib/types";
 
@@ -122,7 +122,7 @@
     if (kw_selectedLangs.size > 0)
       filtered = filtered.filter((s) => kw_selectedLangs.has(s.lang));
     if (!store.settings.showNsfw)
-      filtered = filtered.filter((s) => !s.isNsfw);
+      filtered = filtered.filter((s) => !shouldHideSource(s, store.settings));
     return filtered;
   }
 
@@ -385,13 +385,13 @@
   });
 
   const src_visibleSources = $derived.by(() => {
-    const nsfw = (s: Source) => !store.settings.showNsfw && s.isNsfw;
+    const hide = (s: Source) => shouldHideSource(s, store.settings);
     if (src_selectedLang !== "all") {
-      return allSources.filter((s) => s.lang === src_selectedLang && !nsfw(s));
+      return allSources.filter((s) => s.lang === src_selectedLang && !hide(s));
     }
     const map = new Map<string, Source>();
     for (const s of allSources) {
-      if (nsfw(s)) continue;
+      if (hide(s)) continue;
       const key = s.name;
       const existing = map.get(key);
       if (!existing) { map.set(key, s); continue; }
diff --git a/src/lib/util.ts b/src/lib/util.ts
index 53e12d6..ea5403e 100644
--- a/src/lib/util.ts
+++ b/src/lib/util.ts
@@ -81,6 +81,29 @@ export function shouldHideNsfw(
   return isNsfwManga(manga, settings.nsfwFilteredTags);
 }
 
+/**
+ * Gate for Source objects — parallel to shouldHideNsfw for manga.
+ *
+ * Priority:
+ *   1. Blocked list → always hidden, even when showNsfw is on.
+ *   2. Allowed list → always shown, even if isNsfw is true.
+ *   3. Fallback     → hide when showNsfw is off and source.isNsfw is true.
+ *
+ * Usage:  sources.filter(s => !shouldHideSource(s, settings))
+ */
+export function shouldHideSource(
+  source: { id: string; isNsfw: boolean },
+  settings: {
+    showNsfw:             boolean;
+    nsfwAllowedSourceIds: string[];
+    nsfwBlockedSourceIds: string[];
+  },
+): boolean {
+  if (settings.nsfwBlockedSourceIds.includes(source.id)) return true;
+  if (settings.nsfwAllowedSourceIds.includes(source.id)) return false;
+  return !settings.showNsfw && source.isNsfw;
+}
+
 // ── Source deduplication ──────────────────────────────────────────────────────
 
 export function dedupeSources(sources: Source[], preferredLang: string): Source[] {