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

gtk: take direction into account when creating a new split

Browse Source
This commit is contained in:
Thorsten Ball
2023-10-22 15:32:00 +02:00
committed by Mitchell Hashimoto
parent a50fc7bc50
commit 2ed841145b
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/apprt/gtk/Paned.zig
View File

@ -4,6 +4,7 @@ const std = @import("std");
const Allocator = std.mem.Allocator; const Allocator = std.mem.Allocator;
const assert = std.debug.assert; const assert = std.debug.assert;
const font = @import("../../font/main.zig"); const font = @import("../../font/main.zig");
const input = @import("../../input.zig");
const CoreSurface = @import("../../Surface.zig"); const CoreSurface = @import("../../Surface.zig");
const Window = @import("Window.zig"); const Window = @import("Window.zig");
@ -32,14 +33,14 @@ child2: Tab.Child,
// maximize the parent pane, or close the tab. // maximize the parent pane, or close the tab.
parent: Parent, parent: Parent,
pub fn create(alloc: Allocator, window: *Window, label_text: *c.GtkWidget) !*Paned { pub fn create(alloc: Allocator, window: *Window, direction: input.SplitDirection, label_text: *c.GtkWidget) !*Paned {
var paned = try alloc.create(Paned); var paned = try alloc.create(Paned);
errdefer alloc.destroy(paned); errdefer alloc.destroy(paned);
try paned.init(window, label_text); try paned.init(window, direction, label_text);
return paned; return paned;
} }
pub fn init(self: *Paned, window: *Window, label_text: *c.GtkWidget) !void { pub fn init(self: *Paned, window: *Window, direction: input.SplitDirection, label_text: *c.GtkWidget) !void {
self.* = .{ self.* = .{
.window = window, .window = window,
.label_text = label_text, .label_text = label_text,
@ -49,7 +50,12 @@ pub fn init(self: *Paned, window: *Window, label_text: *c.GtkWidget) !void {
.parent = undefined, .parent = undefined,
}; };
const paned = c.gtk_paned_new(c.GTK_ORIENTATION_HORIZONTAL); const orientation: c_uint = switch (direction) {
.right => c.GTK_ORIENTATION_HORIZONTAL,
.down => c.GTK_ORIENTATION_VERTICAL,
};
const paned = c.gtk_paned_new(orientation);
const gtk_paned: *c.GtkPaned = @ptrCast(paned); const gtk_paned: *c.GtkPaned = @ptrCast(paned);
errdefer c.gtk_widget_destroy(paned); errdefer c.gtk_widget_destroy(paned);
self.paned = gtk_paned; self.paned = gtk_paned;

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

@ -366,7 +366,7 @@ pub fn newSplit(self: *Surface, direction: input.SplitDirection) !void {
tab.removeChild(); tab.removeChild();
const paned = try Paned.create(self.app.core_app.alloc, self.window, label_text); const paned = try Paned.create(self.app.core_app.alloc, self.window, direction, label_text);
const new_surface = try paned.newSurface(tab, &self.core_surface); const new_surface = try paned.newSurface(tab, &self.core_surface);
// This sets .parent on each surface // This sets .parent on each surface
paned.addChild1Surface(self); paned.addChild1Surface(self);