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

gtk: rework naming conflict after rebase

Browse Source
This commit is contained in:
Thorsten Ball
2023-10-31 20:57:01 +01:00
committed by Mitchell Hashimoto
parent ab93579bf6
commit a1fb74d8aa
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/apprt/gtk/Surface.zig
View File

@ -46,6 +46,13 @@ pub const Options = struct {
/// A font size to set on the surface once it is initialized. /// A font size to set on the surface once it is initialized.
font_size: ?font.face.DesiredSize = null, font_size: ?font.face.DesiredSize = null,
/// True if this surface has a parent. This is a bit of a hack currently
/// to work around newConfig unconditinally inheriting the working
/// directory. The proper long term fix is to have the working directory
/// inherited upstream likely at the point where this field would be set,
/// then remove this field.
parentSurface: bool = false,
}; };
/// Where the title of this surface will go. /// Where the title of this surface will go.
@ -59,6 +66,9 @@ const Title = union(enum) {
/// surface has been initialized. /// surface has been initialized.
realized: bool = false, realized: bool = false,
/// See Options.parentSurface
parentSurface: bool = false,
/// The app we're part of /// The app we're part of
app: *App, app: *App,
@ -167,6 +177,7 @@ pub fn init(self: *Surface, app: *App, opts: Options) !void {
} else .{ .none = {} }, } else .{ .none = {} },
.core_surface = undefined, .core_surface = undefined,
.font_size = opts.font_size, .font_size = opts.font_size,
.parentSurface = opts.parentSurface,
.size = .{ .width = 800, .height = 600 }, .size = .{ .width = 800, .height = 600 },
.cursor_pos = .{ .x = 0, .y = 0 }, .cursor_pos = .{ .x = 0, .y = 0 },
.im_context = im_context, .im_context = im_context,
@ -215,8 +226,8 @@ fn realize(self: *Surface) !void {
// Get our new surface config // Get our new surface config
var config = try apprt.surface.newConfig(self.app.core_app, &self.app.config); var config = try apprt.surface.newConfig(self.app.core_app, &self.app.config);
defer config.deinit(); defer config.deinit();
if (!self.parent) { if (!self.parentSurface) {
// A hack, see the "parent" field for more information. // A hack, see the "parentSurface" field for more information.
config.@"working-directory" = self.app.config.@"working-directory"; config.@"working-directory" = self.app.config.@"working-directory";
} }