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

apprt/gtk: stylistic changes

Browse Source
This commit is contained in:
Mitchell Hashimoto
2024-12-15 13:59:02 -08:00
parent 98380f3c42
commit fdd330d22d
2 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -154,7 +154,7 @@ pub fn init(self: *Window, app: *App) !void {
// are decorated or not because we can have a keybind to toggle the // are decorated or not because we can have a keybind to toggle the
// decorations. // decorations.
if (app.config.@"gtk-titlebar") { if (app.config.@"gtk-titlebar") {
const header = HeaderBar.create(self); const header = HeaderBar.init(self);
{ {
const btn = c.gtk_menu_button_new(); const btn = c.gtk_menu_button_new();

44
src/apprt/gtk/headerbar.zig
View File

@ -4,17 +4,17 @@ const c = @import("c.zig").c;
const Window = @import("Window.zig"); const Window = @import("Window.zig");
const adwaita = @import("adwaita.zig"); const adwaita = @import("adwaita.zig");
const AdwHeaderBar = if (adwaita.versionAtLeast(0, 0, 0)) c.AdwHeaderBar else anyopaque; const AdwHeaderBar = if (adwaita.versionAtLeast(0, 0, 0)) c.AdwHeaderBar else void;
pub const HeaderBar = union(enum) { pub const HeaderBar = union(enum) {
adw: *AdwHeaderBar, adw: *AdwHeaderBar,
gtk: *c.GtkHeaderBar, gtk: *c.GtkHeaderBar,
pub fn create(window: *Window) HeaderBar { pub fn init(window: *Window) HeaderBar {
const app = window.app; if ((comptime adwaita.versionAtLeast(1, 4, 0)) and
adwaita.enabled(&window.app.config))
if (comptime adwaita.versionAtLeast(1, 4, 0)) { {
if (adwaita.enabled(&app.config)) return initAdw(); return initAdw();
} }
return initGtk(); return initGtk();
@ -22,13 +22,11 @@ pub const HeaderBar = union(enum) {
fn initAdw() HeaderBar { fn initAdw() HeaderBar {
const headerbar = c.adw_header_bar_new(); const headerbar = c.adw_header_bar_new();
return .{ .adw = @ptrCast(headerbar) }; return .{ .adw = @ptrCast(headerbar) };
} }
fn initGtk() HeaderBar { fn initGtk() HeaderBar {
const headerbar = c.gtk_header_bar_new(); const headerbar = c.gtk_header_bar_new();
return .{ .gtk = @ptrCast(headerbar) }; return .{ .gtk = @ptrCast(headerbar) };
} }
@ -41,21 +39,31 @@ pub const HeaderBar = union(enum) {
pub fn packEnd(self: HeaderBar, widget: *c.GtkWidget) void { pub fn packEnd(self: HeaderBar, widget: *c.GtkWidget) void {
switch (self) { switch (self) {
.adw => |headerbar| if (comptime adwaita.versionAtLeast(0, 0, 0)) .adw => |headerbar| if (comptime adwaita.versionAtLeast(0, 0, 0)) {
c.adw_header_bar_pack_end(@ptrCast(@alignCast(headerbar)), widget) c.adw_header_bar_pack_end(
else @ptrCast(@alignCast(headerbar)),
unreachable, widget,
.gtk => |headerbar| c.gtk_header_bar_pack_end(@ptrCast(@alignCast(headerbar)), widget), );
},
.gtk => |headerbar| c.gtk_header_bar_pack_end(
@ptrCast(@alignCast(headerbar)),
widget,
),
} }
} }
pub fn packStart(self: HeaderBar, widget: *c.GtkWidget) void { pub fn packStart(self: HeaderBar, widget: *c.GtkWidget) void {
switch (self) { switch (self) {
.adw => |headerbar| if (comptime adwaita.versionAtLeast(0, 0, 0)) .adw => |headerbar| if (comptime adwaita.versionAtLeast(0, 0, 0)) {
c.adw_header_bar_pack_start(@ptrCast(@alignCast(headerbar)), widget) c.adw_header_bar_pack_start(
else @ptrCast(@alignCast(headerbar)),
unreachable, widget,
.gtk => |headerbar| c.gtk_header_bar_pack_start(@ptrCast(@alignCast(headerbar)), widget), );
},
.gtk => |headerbar| c.gtk_header_bar_pack_start(
@ptrCast(@alignCast(headerbar)),
widget,
),
} }
} }
}; };