Skip to content

Feature/ctrl + D分离窗口显示窗口控件 + 解决linux环境下无法最大化的问题 #662

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zx1095971114 wants to merge 2 commits into
base: main
Choose a base branch
from
+33 −3
Open

Feature/ctrl + D分离窗口显示窗口控件 + 解决linux环境下无法最大化的问题 #662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e79a3e4
fix: Linux 分离窗口显示最小化/最大化/关闭按钮
zx1095971114 Aug 27, 2026
25d43cc
fix: Linux 分离窗口 maximize 时同步 WebContentsView bounds（保守修复）
zx1095971114 Aug 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions src/main/core/detachedWindowManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,9 @@ class DetachedWindowManager {

// 升级期间的 0 高度是临时状态，不得覆盖用户保存的窗口尺寸。
if (!this.suppressedSizePersistenceWindows.has(windowId)) {
// 最大化/全屏状态触发的 resize 不算用户偏好尺寸，
// 否则会把屏幕工作区尺寸误存为下次 Ctrl+D 的“默认尺寸”。
if (win.isMaximized() || win.isFullScreen()) return
this.schedulePersistWindowSize(
windowId,
pluginName,
Expand All @@ -357,6 +360,33 @@ class DetachedWindowManager {
}
})

// 仅同步 pluginView 位置，不写数据库。
// 用于 maximize/unmaximize 兜底：Linux 上 WM 走 _NET_WM_STATE_MAXIMIZED_*
// 时常不触发 ConfigureNotify，resize 事件可能不发生，导致 pluginView
// 保持旧 bounds、看起来“窗口最大化但内容没放大”。
const syncPluginViewBoundsOnly = (): void => {
if (win.isDestroyed() || pluginView.webContents.isDestroyed()) return
const bounds = win.getContentBounds()
pluginView.setBounds({
x: 0,
y: DETACHED_TITLEBAR_HEIGHT,
width: bounds.width,
height: Math.max(0, bounds.height - DETACHED_TITLEBAR_HEIGHT)
})
}

// maximize/unmaximize 兜底：WM 异步处理状态切换时，多次同步 pluginView，
// 确保 WM 完成几何变更后视图尺寸一定跟上。
// 注意：这里**绝不**调用 schedulePersistWindowSize，也不修改 BrowserWindow
// 几何；持久化和窗口几何全部由 resize 事件处理，避免引入新的副作用。
const syncAfterStateChange = (): void => {
syncPluginViewBoundsOnly()
setImmediate(syncPluginViewBoundsOnly)
setTimeout(syncPluginViewBoundsOnly, 100)
}
win.on('maximize', syncAfterStateChange)
win.on('unmaximize', syncAfterStateChange)

// 保存窗口信息
const windowInfo: DetachedWindowInfo = {
window: win,
Expand Down
6 changes: 3 additions & 3 deletions src/renderer/src/components/detached/DetachedTitlebar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,8 @@
</button>
</div>

<!-- Windows 窗口控制按钮 -->
<div v-if="platform === 'win32'" class="window-controls">
<!-- Windows / Linux 窗口控制按钮：frameless 窗口依赖 HTML 自绘控件 -->
<div v-if="platform === 'win32' || platform === 'linux'" class="window-controls">
<button class="window-btn minimize-btn" @click="minimize">
<svg width="10" height="10" viewBox="0 0 10 10">
<path d="M 0 5 L 10 5" stroke="currentColor" stroke-width="1" />
Expand Down Expand Up @@ -178,7 +178,7 @@ import AdaptiveIcon from '../common/AdaptiveIcon.vue'
import { CommonKeyboardModifier, readModifiers } from '@renderer/utils/convertKeyboardEvent'
import type { AiRequestStatus, AiRequestStatusChange } from '@shared/aiRequestStatus'

const platform = ref<'darwin' | 'win32'>('darwin')
const platform = ref<'darwin' | 'win32' | 'linux'>('darwin')
const pluginName = ref('Plugin')
const pluginId = ref('') // 插件的实际 name（用于数据库操作，与未分离状态保持一致）
const pluginPath = ref('')
Expand Down