From ce88f0229af2dd14eeb01d9a7288708b7ad6e725 Mon Sep 17 00:00:00 2001
From: Huang Xin <chrox.huang@gmail.com>
Date: Sat, 5 Apr 2025 16:08:39 +0800
Subject: [PATCH] fix: rounded reader widget only when sidebar is invisible ,
 closes #809 (#815)

---
 apps/readest-app/src/app/reader/components/BooksGrid.tsx | 7 +++++--
 apps/readest-app/src/app/reader/components/Reader.tsx    | 4 +++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/apps/readest-app/src/app/reader/components/BooksGrid.tsx b/apps/readest-app/src/app/reader/components/BooksGrid.tsx
index 6c5caa85..c5e979fb 100644
--- a/apps/readest-app/src/app/reader/components/BooksGrid.tsx
+++ b/apps/readest-app/src/app/reader/components/BooksGrid.tsx
@@ -28,7 +28,7 @@ const BooksGrid: React.FC<BooksGridProps> = ({ bookKeys, onCloseBook }) => {
   const { appService } = useEnv();
   const { getConfig, getBookData } = useBookDataStore();
   const { getProgress, getViewState, getViewSettings } = useReaderStore();
-  const { sideBarBookKey } = useSidebarStore();
+  const { isSideBarVisible, sideBarBookKey } = useSidebarStore();
   const { isFontLayoutSettingsDialogOpen, setFontLayoutSettingsDialogOpen } = useSettingsStore();
   const gridTemplate = getGridTemplate(bookKeys.length, window.innerWidth / window.innerHeight);
 
@@ -68,7 +68,10 @@ const BooksGrid: React.FC<BooksGridProps> = ({ bookKeys, onCloseBook }) => {
           <div
             id={`gridcell-${bookKey}`}
             key={bookKey}
-            className={`${appService?.hasRoundedWindow ? 'rounded-window' : ''} relative h-full w-full overflow-hidden`}
+            className={clsx(
+              'relative h-full w-full overflow-hidden',
+              !isSideBarVisible && appService?.hasRoundedWindow && 'rounded-window',
+            )}
           >
             {isBookmarked && <Ribbon width={`${horizontalGapPercent}%`} />}
             <HeaderBar
diff --git a/apps/readest-app/src/app/reader/components/Reader.tsx b/apps/readest-app/src/app/reader/components/Reader.tsx
index 6e6e534b..6318a5ca 100644
--- a/apps/readest-app/src/app/reader/components/Reader.tsx
+++ b/apps/readest-app/src/app/reader/components/Reader.tsx
@@ -13,10 +13,12 @@ import { useScreenWakeLock } from '@/hooks/useScreenWakeLock';
 import { AboutWindow } from '@/components/AboutWindow';
 import { Toast } from '@/components/Toast';
 import ReaderContent from './ReaderContent';
+import { useSidebarStore } from '@/store/sidebarStore';
 
 const Reader: React.FC<{ ids?: string }> = ({ ids }) => {
   const { envConfig, appService } = useEnv();
   const { settings, setSettings } = useSettingsStore();
+  const { isSideBarVisible } = useSidebarStore();
   const { getVisibleLibrary, setLibrary } = useLibraryStore();
   const isInitiating = useRef(false);
 
@@ -45,7 +47,7 @@ const Reader: React.FC<{ ids?: string }> = ({ ids }) => {
       <div
         className={clsx(
           `reader-page bg-base-100 text-base-content select-none`,
-          appService?.hasRoundedWindow && 'rounded-window',
+          !isSideBarVisible && appService?.hasRoundedWindow && 'rounded-window',
         )}
       >
         <Suspense>