Revert GTK UI changes, apple-sdk build stuff
parent
625d7274bf
commit
cca10f3ca8
|
|
@ -30,7 +30,6 @@ pub fn addPaths(
|
|||
framework: []const u8,
|
||||
system_include: []const u8,
|
||||
library: []const u8,
|
||||
cxx_include: []const u8,
|
||||
}) = .{};
|
||||
};
|
||||
|
||||
|
|
@ -83,36 +82,11 @@ pub fn addPaths(
|
|||
});
|
||||
};
|
||||
|
||||
const cxx_include_path = cxx: {
|
||||
const preferred = try std.fs.path.join(b.allocator, &.{
|
||||
libc.sys_include_dir.?,
|
||||
"c++",
|
||||
"v1",
|
||||
});
|
||||
if (std.fs.accessAbsolute(preferred, .{})) |_| {
|
||||
break :cxx preferred;
|
||||
} else |_| {}
|
||||
|
||||
const sdk_root = std.fs.path.dirname(libc.sys_include_dir.?).?;
|
||||
const fallback = try std.fs.path.join(b.allocator, &.{
|
||||
sdk_root,
|
||||
"include",
|
||||
"c++",
|
||||
"v1",
|
||||
});
|
||||
if (std.fs.accessAbsolute(fallback, .{})) |_| {
|
||||
break :cxx fallback;
|
||||
} else |_| {}
|
||||
|
||||
break :cxx preferred;
|
||||
};
|
||||
|
||||
gop.value_ptr.* = .{
|
||||
.libc = path,
|
||||
.framework = framework_path,
|
||||
.system_include = libc.sys_include_dir.?,
|
||||
.library = library_path,
|
||||
.cxx_include = cxx_include_path,
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -133,6 +107,5 @@ pub fn addPaths(
|
|||
// https://github.com/ziglang/zig/issues/24024
|
||||
step.root_module.addSystemFrameworkPath(.{ .cwd_relative = value.framework });
|
||||
step.root_module.addSystemIncludePath(.{ .cwd_relative = value.system_include });
|
||||
step.root_module.addSystemIncludePath(.{ .cwd_relative = value.cxx_include });
|
||||
step.root_module.addLibraryPath(.{ .cwd_relative = value.library });
|
||||
}
|
||||
|
|
|
|||
|
|
@ -162,7 +162,6 @@ template $GhosttyWindow: Adw.ApplicationWindow {
|
|||
page-attached => $page_attached();
|
||||
page-detached => $page_detached();
|
||||
create-window => $tab_create_window();
|
||||
menu-model: tab_context_menu;
|
||||
shortcuts: none;
|
||||
}
|
||||
}
|
||||
|
|
@ -193,35 +192,6 @@ menu split_menu {
|
|||
}
|
||||
}
|
||||
|
||||
menu tab_context_menu {
|
||||
section {
|
||||
item {
|
||||
label: _("New Tab");
|
||||
action: "win.new-tab";
|
||||
}
|
||||
}
|
||||
|
||||
section {
|
||||
item {
|
||||
label: _("Close Tab");
|
||||
action: "tab.close";
|
||||
target: "this";
|
||||
}
|
||||
|
||||
item {
|
||||
label: _("Close Other Tabs");
|
||||
action: "tab.close";
|
||||
target: "other";
|
||||
}
|
||||
|
||||
item {
|
||||
label: _("Close Tabs on the Right");
|
||||
action: "tab.close";
|
||||
target: "right";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
menu main_menu {
|
||||
section {
|
||||
item {
|
||||
|
|
|
|||
|
|
@ -540,7 +540,7 @@ fn actionCommands(action: Action.Key) []const Command {
|
|||
},
|
||||
.{
|
||||
.action = .{ .close_tab = .right },
|
||||
.title = "Close Tabs on the Right",
|
||||
.title = "Close Tabs to the Right",
|
||||
.description = "Close every tab to the right of the current one.",
|
||||
},
|
||||
},
|
||||
|
|
|
|||
Loading…
Reference in New Issue