diff --git a/src/renderer/src/components/MinApp/MinappPopupContainer.tsx b/src/renderer/src/components/MinApp/MinappPopupContainer.tsx
index 4a5df7fd8c..45cb25c488 100644
--- a/src/renderer/src/components/MinApp/MinappPopupContainer.tsx
+++ b/src/renderer/src/components/MinApp/MinappPopupContainer.tsx
@@ -143,7 +143,7 @@ const MinappPopupContainer: React.FC = () => {
const { pinned, updatePinnedMinapps } = useMinapps()
const { t } = useTranslation()
const backgroundColor = useNavBackgroundColor()
- const { isLeftNavbar, isTopNavbar } = useNavbarPosition()
+ const { isTopNavbar } = useNavbarPosition()
const dispatch = useAppDispatch()
/** control the drawer open or close */
@@ -165,6 +165,8 @@ const MinappPopupContainer: React.FC = () => {
/** whether the minapps open link external is enabled */
const { minappsOpenLinkExternal } = useSettings()
+ const { isLeftNavbar } = useNavbarPosition()
+
const isInDevelopment = process.env.NODE_ENV === 'development'
useBridge()
@@ -403,7 +405,7 @@ const MinappPopupContainer: React.FC = () => {
)}
-
+
handleGoBack(appInfo.id)}>
@@ -505,7 +507,6 @@ const MinappPopupContainer: React.FC = () => {
closeIcon={null}
style={{
marginLeft: isLeftNavbar ? 'var(--sidebar-width)' : 0,
- marginTop: isTopNavbar ? 'var(--navbar-height)' : 0,
backgroundColor: window.root.style.background
}}>
{/* 在所有小程序中显示GoogleLoginTip */}
@@ -540,7 +541,7 @@ const TitleContainer = styled.div`
padding-left: ${isMac ? '20px' : '10px'};
}
[navbar-position='top'] & {
- padding-left: ${isMac ? '20px' : '10px'};
+ padding-left: ${isMac ? '80px' : '10px'};
border-bottom: 0.5px solid var(--color-border);
}
`
@@ -562,14 +563,14 @@ const TitleTextTooltip = styled.span`
}
`
-const ButtonsGroup = styled.div<{ isTopNavBar: boolean }>`
+const ButtonsGroup = styled.div`
display: flex;
flex-direction: row;
align-items: center;
gap: 5px;
-webkit-app-region: no-drag;
&.windows {
- margin-right: ${(props) => (props.isTopNavBar ? 0 : isWin ? '130px' : isLinux ? '100px' : 0)};
+ margin-right: ${isWin ? '130px' : isLinux ? '100px' : 0};
background-color: var(--color-background-mute);
border-radius: 50px;
padding: 0 3px;
diff --git a/src/renderer/src/components/MinApp/WebviewContainer.tsx b/src/renderer/src/components/MinApp/WebviewContainer.tsx
index 2d63e805be..361bd39696 100644
--- a/src/renderer/src/components/MinApp/WebviewContainer.tsx
+++ b/src/renderer/src/components/MinApp/WebviewContainer.tsx
@@ -23,7 +23,7 @@ const WebviewContainer = memo(
}) => {
const webviewRef = useRef(null)
const { enableSpellCheck } = useSettings()
- const { isLeftNavbar, isTopNavbar } = useNavbarPosition()
+ const { isLeftNavbar } = useNavbarPosition()
const setRef = (appid: string) => {
onSetRefCallback(appid, null)
@@ -74,7 +74,7 @@ const WebviewContainer = memo(
const WebviewStyle: React.CSSProperties = {
width: isLeftNavbar ? 'calc(100vw - var(--sidebar-width))' : '100vw',
- height: isTopNavbar ? 'calc(100vh - var(--navbar-height) - var(--navbar-height))' : '100vh',
+ height: 'calc(100vh - var(--navbar-height))',
backgroundColor: 'var(--color-background)',
display: 'inline-flex'
}
diff --git a/src/renderer/src/hooks/useAppInit.ts b/src/renderer/src/hooks/useAppInit.ts
index af7f44cb01..60b8ce448d 100644
--- a/src/renderer/src/hooks/useAppInit.ts
+++ b/src/renderer/src/hooks/useAppInit.ts
@@ -18,7 +18,7 @@ import { useEffect } from 'react'
import { useDefaultModel } from './useAssistant'
import useFullScreenNotice from './useFullScreenNotice'
import { useRuntime } from './useRuntime'
-import { useNavbarPosition, useSettings } from './useSettings'
+import { useSettings } from './useSettings'
import useUpdateHandler from './useUpdateHandler'
const logger = loggerService.withContext('useAppInit')
@@ -31,7 +31,6 @@ export function useAppInit() {
const avatar = useLiveQuery(() => db.settings.get('image://avatar'))
const { theme } = useTheme()
const memoryConfig = useAppSelector(selectMemoryConfig)
- const { isTopNavbar } = useNavbarPosition()
useEffect(() => {
document.getElementById('spinner')?.remove()
@@ -86,17 +85,13 @@ export function useAppInit() {
const transparentWindow = windowStyle === 'transparent' && isMac && !minappShow
if (minappShow) {
- if (isTopNavbar) {
- window.root.style.background = 'var(--navbar-background)'
- } else {
- window.root.style.background =
- windowStyle === 'transparent' && isMac ? 'var(--color-background)' : 'var(--navbar-background)'
- }
+ window.root.style.background =
+ windowStyle === 'transparent' && isMac ? 'var(--color-background)' : 'var(--navbar-background)'
return
}
window.root.style.background = transparentWindow ? 'var(--navbar-background-mac)' : 'var(--navbar-background)'
- }, [windowStyle, minappShow, theme, isTopNavbar])
+ }, [windowStyle, minappShow, theme])
useEffect(() => {
if (isLocalAi) {