Skip to content

Commit

Permalink
rename gtkVersionMinimum->gtkVersionAtLeast for consistency
Browse files Browse the repository at this point in the history
  • Loading branch information
jcollie authored and mitchellh committed Sep 1, 2024
1 parent b6c9433 commit bbb204a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions src/apprt/gtk/Surface.zig
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ const ClipboardConfirmationWindow = @import("ClipboardConfirmationWindow.zig");
const ResizeOverlay = @import("ResizeOverlay.zig");
const inspector = @import("inspector.zig");
const gtk_key = @import("key.zig");
const c = @import("c.zig").c;
const cpkg = @import("c.zig");
const c = cpkg.c;
const x11 = @import("x11.zig");

const log = std.log.scoped(.gtk_surface);
Expand Down Expand Up @@ -823,7 +824,7 @@ pub fn shouldClose(self: *const Surface) bool {

pub fn getContentScale(self: *const Surface) !apprt.ContentScale {
const gtk_scale: f32 = scale: {
if (comptime c.gtkVersionMinimum(4, 12)) {
if (comptime cpkg.gtkVersionAtLeast(4, 12)) {
const native = c.gtk_widget_get_native(@ptrCast(self.gl_area));
const surface = c.gtk_native_get_surface(native);
break :scale @floatCast(c.gdk_surface_get_scale(surface));
Expand Down
2 changes: 1 addition & 1 deletion src/apprt/gtk/c.zig
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ pub const c = @cImport({
@cInclude("ghostty_gtk_compat.h");
});

pub fn gtkVersionMinimum(comptime major: c_int, comptime minor: c_int) bool {
pub fn gtkVersionAtLeast(comptime major: c_int, comptime minor: c_int) bool {
return (c.GTK_MAJOR_VERSION > major or
(c.GTK_MAJOR_VERSION == major and c.GTK_MINOR_VERSION >= minor));
}

0 comments on commit bbb204a

Please sign in to comment.