Skip to content

Your Android phone and your Windows PC, working as one. Local-first, end-to-end encrypted, no account.

fix(desktop): resolve macOS titlebar clipping and layout

saivinay1805b185866fa6cb
diff --git a/desktop/app/cpp/native_window.cpp b/desktop/app/cpp/native_window.cpp
index 3244ef9..1731550 100644
--- a/desktop/app/cpp/native_window.cpp
+++ b/desktop/app/cpp/native_window.cpp
@@ -60,8 +60,10 @@ void trimD3DResources(QQuickWindow * /*window*/) {}
NativeWindow::NativeWindow(QWindow *parent)
: QQuickWindow(parent)
{
- // Qt removes the system title bar and lets content fill the window.
+#ifdef _WIN32
+ // Qt removes the system title bar and lets content fill the window on Windows.
setFlags(flags() | Qt::ExpandedClientAreaHint);
+#endif
setColor(Qt::transparent);
// Drop the scene graph and D3D/RHI resources when the window is hidden or
// closed to the tray instead of keeping GPU buffers in private commit.
diff --git a/desktop/app/qml/components/CaptionButtons.qml b/desktop/app/qml/components/CaptionButtons.qml
index 9df80ed..25f677b 100644
--- a/desktop/app/qml/components/CaptionButtons.qml
+++ b/desktop/app/qml/components/CaptionButtons.qml
@@ -12,6 +12,9 @@ Row {
required property NativeWindow window
readonly property bool maximized: window.visibility === Window.Maximized
+ visible: Qt.platform.os === "windows"
+ width: visible ? implicitWidth : 0
+
// As tall as the top bar, like Windows 11's tall title bars, so the glyphs
// line up with the page title and the logo.
height: Theme.topBarHeight
diff --git a/desktop/app/src/main.rs b/desktop/app/src/main.rs
index 1ed17c9..7723b5d 100644
--- a/desktop/app/src/main.rs
+++ b/desktop/app/src/main.rs
@@ -7,6 +7,7 @@
// A GUI app: no console window in release builds.
#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
+#![cfg_attr(not(windows), allow(unused))]
mod automations;
mod battery;