diff --git a/include/ghostty.h b/include/ghostty.h index 48c1990bc..b2c6ba6f3 100644 --- a/include/ghostty.h +++ b/include/ghostty.h @@ -365,7 +365,6 @@ bool ghostty_config_get(ghostty_config_t, void *, const char *, uintptr_t); ghostty_input_trigger_s ghostty_config_trigger(ghostty_config_t, const char *, uintptr_t); uint32_t ghostty_config_errors_count(ghostty_config_t); ghostty_error_s ghostty_config_get_error(ghostty_config_t, uint32_t); -bool ghostty_config_render_decoration(ghostty_config_t); ghostty_app_t ghostty_app_new(const ghostty_runtime_config_s *, ghostty_config_t); void ghostty_app_free(ghostty_app_t); diff --git a/macos/Sources/Features/Primary Window/PrimaryWindow.swift b/macos/Sources/Features/Primary Window/PrimaryWindow.swift index 258c7d19b..17632f694 100644 --- a/macos/Sources/Features/Primary Window/PrimaryWindow.swift +++ b/macos/Sources/Features/Primary Window/PrimaryWindow.swift @@ -16,19 +16,22 @@ class FocusedSurfaceWrapper { class PrimaryWindow: NSWindow { var focusedSurfaceWrapper: FocusedSurfaceWrapper = FocusedSurfaceWrapper() - static func getStyleMask(render_decoration: Bool) -> NSWindow.StyleMask { + static func getStyleMask(renderDecoration: Bool) -> NSWindow.StyleMask { var mask: NSWindow.StyleMask = [.resizable, .closable, .miniaturizable] - if render_decoration { + if renderDecoration { mask.insert(.titled) } return mask } static func create(ghostty: Ghostty.AppState, appDelegate: AppDelegate, baseConfig: ghostty_surface_config_s? = nil) -> PrimaryWindow { - let decorations = baseConfig?.render_decoration ?? ghostty_config_render_decoration(ghostty.config) + var renderDecoration = false; + let configString = "window-decoration" + _ = ghostty_config_get(ghostty.config, &renderDecoration, configString, UInt(configString.count)) + let window = PrimaryWindow( contentRect: NSRect(x: 0, y: 0, width: 800, height: 600), - styleMask: getStyleMask(render_decoration: decorations), + styleMask: getStyleMask(renderDecoration: baseConfig?.render_decoration ?? renderDecoration), backing: .buffered, defer: false) window.center() diff --git a/src/config/CAPI.zig b/src/config/CAPI.zig index 46cc8edad..be2a491e7 100644 --- a/src/config/CAPI.zig +++ b/src/config/CAPI.zig @@ -119,10 +119,6 @@ export fn ghostty_config_get_error(self: *Config, idx: u32) Error { return .{ .message = err.message.ptr }; } -export fn ghostty_config_render_decoration(self: *Config) bool { - return self.@"window-decoration"; -} - /// Sync with ghostty_error_s const Error = extern struct { message: [*:0]const u8 = "",