feat: support windows transparent title bar. #1578

Sanlorng · 2025-01-24T16:30:53Z

Add windows transparent title bar.
Move macOS special window adaption to MacOSWindowFrame.kt.
Refactor WindowsWindowUtils.kt partially.

output20250125.mp4

1. Add windows transparent title bar. 2. Move macOS special window adaption to MacOSWindowFrame.kt. 3. Refactor WindowsWindowUtils.kt partially.

StageGuard · 2025-01-24T16:52:17Z

app/desktop/src/main/kotlin/window/WindowsWindowFrame.kt

+        }
+        Box(modifier = Modifier.fillMaxSize()) {
+            val isFullScreen = isSystemInFullscreen()
+            val isTitleBarVisible = remember(isFullScreen) { mutableStateOf(!isFullScreen) }


remember { derivedStateOf { !isFullScreen } }

只是取否无需有这个 remember/state

isTitleBarVisible初始状态需要在isFullScreen变化时重新初始化，后续还有控制它在全屏下显示的需求，你往下看有一个Spacer，设置了一个hoverable，用来控制TitleBar显示。

StageGuard · 2025-01-24T17:02:56Z

app/shared/ui-foundation/src/desktopMain/kotlin/platform/window/LayoutHitTestOwner.kt

+    @OptIn(InternalComposeUiApi::class)
+    val classLoader = ComposeScene::class.java.classLoader!!
+
+    private val rootNodeOwnerOwnerField =


这些 class 应该缓存

这些 class 应该缓存

ComposeScene只负责拿ClassLoader，不需要缓存

app/shared/ui-foundation/src/desktopMain/kotlin/platform/window/TitleBarThemeController.kt

Cache the `HitTestResult` constructor to avoid reflection overhead on every hit test.

StageGuard

除了 review 的问题，还需要解决以下问题

窗口只有 left right 和 bottom 有边框线，top 没有

拖拽调整大小的光标似乎只有在窗口内才会检测状态，在窗口外会显示错误的拖拽光标

https://t.me/sg_pubmsg_backup/3

最大化时全屏的窗口动画有问题，似乎先移动到了最大化前小窗口的位置再瞬移。

https://t.me/sg_pubmsg_backup/2

反射的类需要添加 progurad 规则

app/shared/ui-foundation/src/desktopMain/kotlin/platform/window/LayoutHitTestOwner.kt

StageGuard · 2025-01-25T10:51:24Z

app/shared/ui-foundation/src/desktopMain/kotlin/platform/window/LayoutHitTestOwner.kt

+
+    private val layers =
+        CopiedList {
+            for (layer in layersRef) {


这个 CopiedList 有啥用，为什么不直接在下面的 hitTest 里 layersRef.forEach

CopiedList 的实现比较晦涩, 我也建议考虑 forEach

StageGuard · 2025-01-25T11:07:46Z

app/shared/ui-foundation/src/desktopMain/kotlin/platform/window/WindowsWindowUtils.kt

+    fun windowIsActive(platformWindow: PlatformWindow): Flow<Boolean?> {
+        return snapshotFlow { platformWindow.titleBarWindowProc }
+            .flatMapConcat {
+                it?.windowIsActive ?: flow<Boolean?> { emit(null) }


default to MutableStateFlow<Boolean?>(false)

MSF changes semantics.

use flowOf(null) instaed

Him188 · 2025-01-25T20:21:17Z

app/desktop/src/main/kotlin/AniDesktop.kt

+        LaunchedEffect(themeSettings.darkMode, titleBarThemeController, systemTheme) {
+            titleBarThemeController?.isDark = when (themeSettings.darkMode) {
+                DarkMode.AUTO -> systemTheme == SystemTheme.Dark
+                DarkMode.LIGHT -> false
+                DarkMode.DARK -> true
+            }
+        }


no need to use LaunchedEffect

Suggested change

LaunchedEffect(themeSettings.darkMode, titleBarThemeController, systemTheme) {

titleBarThemeController?.isDark = when (themeSettings.darkMode) {

DarkMode.AUTO -> systemTheme == SystemTheme.Dark

DarkMode.LIGHT -> false

DarkMode.DARK -> true

}

}

titleBarThemeController?.isDark = when (themeSettings.darkMode) {

DarkMode.AUTO -> systemTheme == SystemTheme.Dark

DarkMode.LIGHT -> false

DarkMode.DARK -> true

}

Him188 · 2025-01-25T20:24:26Z

app/desktop/src/main/kotlin/window/WindowsWindowFrame.kt

+
+@OptIn(ExperimentalTextApi::class, InternalComposeUiApi::class)
+@Composable
+fun FrameWindowScope.WindowsWindowFrame(


这个有可能能写 ui tset 吗

Window proc和LayoutHitTestOwner需要有Window显示才能测试

那 headless 模式确实应该是不行的，那就算了

Him188 · 2025-01-25T20:27:28Z

app/shared/ui-foundation/src/desktopMain/kotlin/platform/window/LayoutHitTestOwner.kt

+fun rememberLayoutHitTestOwner(): LayoutHitTestOwner? {
+    val scene = LocalComposeScene.current ?: return null
+    return remember(scene) {
+        when (scene::class.qualifiedName) {
+            "androidx.compose.ui.scene.CanvasLayersComposeSceneImpl" -> {
+                CanvasLayersLayoutHitTestOwner(scene)
+            }
+
+            "androidx.compose.ui.scene.PlatformLayersComposeSceneImpl" -> {
+                PlatformLayersLayoutHitTestOwner(scene)
+            }
+
+            else -> error("unsupported compose scene")
+        }
+    }
+}
+


need proguard rules

Him188 · 2025-01-25T20:30:14Z

app/shared/ui-foundation/src/desktopMain/kotlin/platform/window/LayoutHitTestOwner.kt

+
+    private val layers =
+        CopiedList {
+            for (layer in layersRef) {


CopiedList 的实现比较晦涩, 我也建议考虑 forEach

Him188 · 2025-01-25T20:31:23Z

app/shared/ui-foundation/src/desktopMain/kotlin/platform/window/TitleBarThemeController.kt

+//This controller should only be created and passed when the caption button is in the top end position.
+val LocalTitleBarThemeController = compositionLocalOf<TitleBarThemeController?> { null }
+
+class TitleBarThemeController {


Does this work on Android/mac?

如果不是, 需要注释

Him188 · 2025-01-25T20:36:00Z

app/shared/ui-foundation/src/desktopMain/kotlin/platform/window/WindowsWindowUtils.kt

+        val hitClient: Int get() = HTCLIENT
+
+        val hitMaxButton: Int get() = HTMAXBUTTON
+
+        val hitMinimize: Int get() = HTMINBUTTON
+
+        val hitClose: Int get() = HTCLOSE
+
+        val hitCaption: Int get() = HTCAPTION


no need to be public?

no need to be public?

ExtendUser32和WindowsWindowFrame不在同一个模块，如果不需要这样的话，我用suppress invisible member来处理吧

Him188 · 2025-01-25T20:37:54Z

...undation/src/desktopMain/kotlin/ui/foundation/effects/DarkCaptionButtonAppearance.desktop.kt

+    val titleBarController = LocalTitleBarThemeController.current
+    DisposableEffect(titleBarController) {
+        if (titleBarController == null) return@DisposableEffect onDispose { }


Suggested change

val titleBarController = LocalTitleBarThemeController.current

DisposableEffect(titleBarController) {

if (titleBarController == null) return@DisposableEffect onDispose { }

val titleBarController = LocalTitleBarThemeController.current ?: return

DisposableEffect(titleBarController) {

Him188 · 2025-01-25T20:39:23Z

app/shared/src/commonMain/kotlin/ui/main/MainScene.kt

+            val isRightCaptionButton =
+                WindowInsets.desktopCaptionButton.getRight(LocalDensity.current, LocalLayoutDirection.current) > 0


这个可以写一个通用函数, 因为以后很可能还会有这些逻辑
期望调用方法:

WindowInsets.desktopCaptionButton.isTopRight()

Him188 · 2025-01-25T20:43:09Z

app/shared/src/commonMain/kotlin/ui/main/MainScene.kt

+                Modifier.ifThen(navigationLayoutType != NavigationSuiteType.NavigationBar && !isRightCaptionButton) {
                    // macos 标题栏只会在 NavigationRail 的区域内, TabContent 区域无需这些 padding.
                    consumeWindowInsets(WindowInsets.desktopTitleBar())


可以优化一下注释

Suggested change

Modifier.ifThen(navigationLayoutType != NavigationSuiteType.NavigationBar && !isRightCaptionButton) {

// macos 标题栏只会在 NavigationRail 的区域内, TabContent 区域无需这些 padding.

consumeWindowInsets(WindowInsets.desktopTitleBar())

Modifier.ifThen(

navigationLayoutType != NavigationSuiteType.NavigationBar

&& !isRightCaptionButton // Windows caption button 在右侧, 没有足够空间放置按钮, 需要保留 title bar insets

) {

// macos 标题栏只会在 NavigationRail 的区域内, TabContent 区域无需这些 padding.

consumeWindowInsets(WindowInsets.desktopTitleBar())

Him188 · 2025-01-25T20:44:28Z

app/desktop/src/main/kotlin/window/WindowsWindowFrame.kt

+) {
+    val layoutHitTestOwner = rememberLayoutHitTestOwner()
+    val platformWindow = LocalPlatformWindow.current
+    if (layoutHitTestOwner != null) {


better to write:

if (layoutHitTestOwner == null) { content() return } // rest of code.

这样逻辑更简单, 因为提前 return 掉了, 就不需要看后面代码了

fail fast 减少嵌套

Him188 · 2025-01-25T21:21:17Z

即使我一直参与群内讨论, 我也仍然不是很能了解现在 insets 架构, 对于以后新开发者来说就更不好理解了. 所以最好要有一个 insets 系统的描述性文档, 也就是:

现在的 insets 系统有哪些组件? WindowInsets.desktopTitleBar(), WindowInsets.captionButton, LocalCaptionButtonInsets 什么的有什么区别/关联?
每个页面是否默认会有这些 insets/padding
处理这些 insets 的示例

The `LaunchedEffect` used to update the title bar theme based on dark mode settings and system theme has been removed. The title bar theme is now updated directly, eliminating the need for a coroutine scope.

Simplify the `windowIsActive` and `windowAccentColor` flows in `WindowsWindowUtils` by using `flowOf` instead of `flow` for emitting null or default values. This makes the code more concise and readable.

This commit refactors the code to use the `isTopRight()` function for checking if window insets are on the top right. This simplifies the logic and makes the code more readable.

The change handles the case when titleBarController is null in DarkCaptionButtonAppearance by returning early.

StageGuard · 2025-01-26T03:14:52Z

关闭窗口必报错

Jan 26, 2025 11:11:38 AM com.sun.jna.Native$1 uncaughtException
WARNING: JNA: Callback me.him188.ani.app.platform.window.TitleBarWindowProc@1fdbebff threw the following exception
java.lang.IllegalStateException: Can't lock DrawingSurface
	at org.jetbrains.skiko.DrawingSurface.lock(AWT.kt:35)
	at org.jetbrains.skiko.AWTKt.useDrawingSurfaceInfo(AWT.kt:94)
	at org.jetbrains.skiko.AWTKt.useDrawingSurfacePlatformInfo(AWT.kt:12)
	at org.jetbrains.skiko.HardwareLayer.getContentHandle(HardwareLayer.kt:41)
	at org.jetbrains.skiko.SkiaLayer.getContentHandle(SkiaLayer.awt.kt:226)
	at me.him188.ani.app.platform.window.TitleBarWindowProc.callback(WindowsWindowUtils.kt:838)
	at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
	at java.base/java.lang.reflect.Method.invoke(Method.java:580)
	at com.sun.jna.CallbackReference$DefaultCallbackProxy.invokeCallback(CallbackReference.java:585)
	at com.sun.jna.CallbackReference$DefaultCallbackProxy.callback(CallbackReference.java:616)
	at java.desktop/sun.awt.windows.WToolkit.eventLoop(Native Method)
	at java.desktop/sun.awt.windows.WToolkit.run(WToolkit.java:360)
	at java.base/java.lang.Thread.run(Thread.java:1583)

Update the desktop hit test implementation to use the `_layersCopyCache` field instead of the `layers` field. This ensures that the hit test is performed on the correct set of layers and improves performance.

This change avoids title bar buttons hit test interference by excluding AbstractClickableNodes and HoverableNodes from hit test results. This ensures that pointer input for Material 3 components is detected correctly.

The change handles the case when layoutHitTestOwner is null in WindowsWindowFrame by returning early and calling the content function.

This change improves the organization of the code and makes it more maintainable.

the `SkiaLayerHitTestWindowProc` class is now internal and its `contentHandle` property is exposed for access.

Move the `windowsBuildNumber()` function to `WindowsWindowUtils` to avoid redundant code and improve maintainability. Also draw a fake top border when window is inactive on Windows version less than 22000 (Windows 11).

Him188 · 2025-01-26T21:26:35Z

解决 conversation 后可以 request 一下我

…less than 22000 (Windows 11) This commit fixes the issue where the top border of the window is not drawn correctly when the window is inactive on Windows versions less than 22000 (Windows 11). It achieves this by drawing a fake top border using `drawLine` when the window is inactive and the Windows version is less than 22000. The color of the fake border is determined based on whether the window frame is colorful and the window's active state. If the window frame is colorful and the window is active, the accent color is used. If the window frame is not colorful or the window is inactive, a default color is used.

The top padding calculation for maximized windows on Windows has been corrected. Previously, it was not taking into account the frameX value, which could result in incorrect padding. This change ensures that the top padding is calculated correctly, even when the window is maximized.

The `hitTest` logic in `WindowsWindowUtils` has been updated to improve window resizing behavior. - Add `hitTestWindowResizerBorder` method to determine if the cursor is within the window resizer border. - Call `hitTestWindowResizerBorder` before `childHitTest` and only call it if the window is not maximized. - Update `WM_NCHITTEST` message logic. - Return `HTNOWHERE` when `hitTestWindowResizerBorder` is not triggered. - `hitTestResult` will use the result of `callResult.toInt()` from `CallWindowProc` in some cases.

feat: support windows transparent title bar.

8286bde

1. Add windows transparent title bar. 2. Move macOS special window adaption to MacOSWindowFrame.kt. 3. Refactor WindowsWindowUtils.kt partially.

StageGuard requested changes Jan 24, 2025

View reviewed changes

Sanlorng added 5 commits January 25, 2025 08:26

Fix: Cache the HitTestResult constructor

c28a57e

Cache the `HitTestResult` constructor to avoid reflection overhead on every hit test.

update nc_cal_size behavior

0d81d60

Update some comments.

e2cb66c

Fix: Remove some unnecessary reflection invoke.

2a0306c

Remove println in LayoutHitTestOwner.kt

acf9055

StageGuard requested changes Jan 25, 2025

View reviewed changes

Him188 reviewed Jan 25, 2025

View reviewed changes

Sanlorng added 5 commits January 26, 2025 10:06

Remove LaunchedEffect and directly update title bar theme

d22c8e9

The `LaunchedEffect` used to update the title bar theme based on dark mode settings and system theme has been removed. The title bar theme is now updated directly, eliminating the need for a coroutine scope.

Refactor: Simplify window state flows in WindowsWindowUtils

4c69593

Simplify the `windowIsActive` and `windowAccentColor` flows in `WindowsWindowUtils` by using `flowOf` instead of `flow` for emitting null or default values. This makes the code more concise and readable.

Refactor: Use isTopRight() function for window insets

b14c204

This commit refactors the code to use the `isTopRight()` function for checking if window insets are on the top right. This simplifies the logic and makes the code more readable.

Fix: Handle null titleBarController in DarkCaptionButtonAppearance

de56331

The change handles the case when titleBarController is null in DarkCaptionButtonAppearance by returning early.

Add comments to clarify usage of TitleBarThemeController

90e1461

Sanlorng and others added 8 commits January 26, 2025 12:52

Refactor: Update desktop hit test to use _layersCopyCache

6ccf14a

Update the desktop hit test implementation to use the `_layersCopyCache` field instead of the `layers` field. This ensures that the hit test is performed on the correct set of layers and improves performance.

Fix: Avoid title bar buttons hit test interference

02a7683

This change avoids title bar buttons hit test interference by excluding AbstractClickableNodes and HoverableNodes from hit test results. This ensures that pointer input for Material 3 components is detected correctly.

Fix: Handle null layoutHitTestOwner in WindowsWindowFrame

86b86bb

The change handles the case when layoutHitTestOwner is null in WindowsWindowFrame by returning early and calling the content function.

Refactor: Remove window hit test constants in WindowsWindowUtils.

52803a9

This change improves the organization of the code and makes it more maintainable.

Refactor: Update TitleBarWindowProc post ncbutton message logic

598ef04

the `SkiaLayerHitTestWindowProc` class is now internal and its `contentHandle` property is exposed for access.

Refactor: Move windowsBuildNumber() to WindowsWindowUtils

f137c27

Move the `windowsBuildNumber()` function to `WindowsWindowUtils` to avoid redundant code and improve maintainability. Also draw a fake top border when window is inactive on Windows version less than 22000 (Windows 11).

Mark some raw platform methods in WindowUtils.

65f2cbd

Apply window title property only when dependencies changes.

39f0836

Sanlorng added 3 commits January 27, 2025 14:54

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: support windows transparent title bar. #1578

feat: support windows transparent title bar. #1578

Sanlorng commented Jan 24, 2025

StageGuard Jan 24, 2025

Him188 Jan 24, 2025

Sanlorng Jan 25, 2025

StageGuard Jan 24, 2025

Sanlorng Jan 25, 2025

StageGuard left a comment •

edited by Him188

Loading

StageGuard Jan 25, 2025

Him188 Jan 25, 2025 •

edited

Loading

StageGuard Jan 25, 2025

Him188 Jan 25, 2025

Him188 Jan 25, 2025

Him188 Jan 25, 2025

Sanlorng Jan 26, 2025

Him188 Jan 26, 2025

Him188 Jan 25, 2025

Him188 Jan 25, 2025 •

edited

Loading

Him188 Jan 25, 2025

Him188 Jan 25, 2025

Sanlorng Jan 26, 2025 •

edited

Loading

Him188 Jan 25, 2025

Him188 Jan 25, 2025 •

edited

Loading

Him188 Jan 25, 2025

Him188 Jan 25, 2025

StageGuard Jan 26, 2025

Him188 commented Jan 25, 2025 •

edited

Loading

StageGuard commented Jan 26, 2025

Him188 commented Jan 26, 2025

		val isRightCaptionButton =
		WindowInsets.desktopCaptionButton.getRight(LocalDensity.current, LocalLayoutDirection.current) > 0

feat: support windows transparent title bar. #1578

Are you sure you want to change the base?

feat: support windows transparent title bar. #1578

Conversation

Sanlorng commented Jan 24, 2025

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

StageGuard left a comment • edited by Him188 Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Him188 Jan 25, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Him188 Jan 25, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Sanlorng Jan 26, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Him188 Jan 25, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Him188 commented Jan 25, 2025 • edited Loading

StageGuard commented Jan 26, 2025

Him188 commented Jan 26, 2025

StageGuard left a comment •

edited by Him188

Loading

Him188 Jan 25, 2025 •

edited

Loading

Him188 Jan 25, 2025 •

edited

Loading

Sanlorng Jan 26, 2025 •

edited

Loading

Him188 Jan 25, 2025 •

edited

Loading

Him188 commented Jan 25, 2025 •

edited

Loading