Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-07-14 15:56:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into fix-triple-clicking-drag

Browse Source
This commit is contained in:
otomist
2025-01-14 22:17:18 -05:00
parent daeed453dc 331b7c754c
commit 4f93864db7
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/apprt/gtk/Window.zig
View File

@ -410,7 +410,7 @@ pub fn syncAppearance(self: *Window, config: *const configpkg.Config) !void {
// Disable the title buttons (close, maximize, minimize, ...) // Disable the title buttons (close, maximize, minimize, ...)
// *inside* the tab overview if CSDs are disabled. // *inside* the tab overview if CSDs are disabled.
// We do spare the search button, though. // We do spare the search button, though.
if ((comptime adwaita.versionAtLeast(0, 0, 0)) and if ((comptime adwaita.versionAtLeast(1, 4, 0)) and
adwaita.enabled(&self.app.config)) adwaita.enabled(&self.app.config))
{ {
if (self.tab_overview) |tab_overview| { if (self.tab_overview) |tab_overview| {

18
src/config/Config.zig
View File

@ -5921,13 +5921,13 @@ pub const WindowDecoration = enum {
server, server,
none, none,
pub fn parseCLI(input: ?[]const u8) !WindowDecoration { pub fn parseCLI(input_: ?[]const u8) !WindowDecoration {
const input_ = input orelse return .client; const input = input_ orelse return .client;
return if (cli.args.parseBool(input_)) |b| return if (cli.args.parseBool(input)) |b|
if (b) .client else .none if (b) .client else .none
else |_| if (std.mem.eql(u8, input_, "server")) else |_| if (std.meta.stringToEnum(WindowDecoration, input)) |v|
.server v
else else
error.InvalidValue; error.InvalidValue;
} }
@ -5964,6 +5964,14 @@ pub const WindowDecoration = enum {
const v = try WindowDecoration.parseCLI("server"); const v = try WindowDecoration.parseCLI("server");
try testing.expectEqual(WindowDecoration.server, v); try testing.expectEqual(WindowDecoration.server, v);
} }
{
const v = try WindowDecoration.parseCLI("client");
try testing.expectEqual(WindowDecoration.client, v);
}
{
const v = try WindowDecoration.parseCLI("none");
try testing.expectEqual(WindowDecoration.none, v);
}
{ {
try testing.expectError(error.InvalidValue, WindowDecoration.parseCLI("")); try testing.expectError(error.InvalidValue, WindowDecoration.parseCLI(""));
try testing.expectError(error.InvalidValue, WindowDecoration.parseCLI("aaaa")); try testing.expectError(error.InvalidValue, WindowDecoration.parseCLI("aaaa"));