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

Merge pull request #2247 from Pangoraw/warning-new-position

Browse Source 
gtk: prevent invalid call to adw_tab_view_get_selected_page
This commit is contained in:
Mitchell Hashimoto
2024-09-16 09:35:07 -07:00
committed by GitHub
parent 4241eac890 89506e5933
commit bc14ac3672
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/apprt/gtk/notebook.zig
View File

@ -90,18 +90,24 @@ pub const Notebook = union(enum) {
}; };
} }
pub fn currentPage(self: Notebook) c_int { /// Returns the index of the currently selected page.
/// Returns null if the notebook has no pages.
fn currentPage(self: Notebook) ?c_int {
switch (self) { switch (self) {
.adw_tab_view => |tab_view| { .adw_tab_view => |tab_view| {
if (comptime !adwaita.versionAtLeast(0, 0, 0)) unreachable; if (comptime !adwaita.versionAtLeast(0, 0, 0)) unreachable;
const page = c.adw_tab_view_get_selected_page(tab_view); const page = c.adw_tab_view_get_selected_page(tab_view) orelse return null;
return c.adw_tab_view_get_page_position(tab_view, page); return c.adw_tab_view_get_page_position(tab_view, page);
}, },
.gtk_notebook => |notebook| return c.gtk_notebook_get_current_page(notebook), .gtk_notebook => |notebook| {
const current = c.gtk_notebook_get_current_page(notebook);
return if (current == -1) null else current;
},
} }
} }
/// Returns the currently selected tab or null if there are none.
pub fn currentTab(self: Notebook) ?*Tab { pub fn currentTab(self: Notebook) ?*Tab {
const child = switch (self) { const child = switch (self) {
.adw_tab_view => |tab_view| child: { .adw_tab_view => |tab_view| child: {
@ -112,8 +118,7 @@ pub const Notebook = union(enum) {
}, },
.gtk_notebook => |notebook| child: { .gtk_notebook => |notebook| child: {
const page = self.currentPage(); const page = self.currentPage() orelse return null;
if (page == -1) return null;
break :child c.gtk_notebook_get_nth_page(notebook, page); break :child c.gtk_notebook_get_nth_page(notebook, page);
}, },
}; };
@ -184,9 +189,10 @@ pub const Notebook = union(enum) {
} }
fn newTabInsertPosition(self: Notebook, tab: *Tab) c_int { fn newTabInsertPosition(self: Notebook, tab: *Tab) c_int {
const numPages = self.nPages();
return switch (tab.window.app.config.@"window-new-tab-position") { return switch (tab.window.app.config.@"window-new-tab-position") {
.current => self.currentPage() + 1, .current => if (self.currentPage()) |page| page + 1 else numPages,
.end => self.nPages(), .end => numPages,
}; };
} }
@ -313,7 +319,7 @@ pub const Notebook = union(enum) {
} }
} }
pub fn getNotebookPageIndex(page: *c.GtkNotebookPage) c_int { fn getNotebookPageIndex(page: *c.GtkNotebookPage) c_int {
var value: c.GValue = std.mem.zeroes(c.GValue); var value: c.GValue = std.mem.zeroes(c.GValue);
defer c.g_value_unset(&value); defer c.g_value_unset(&value);
_ = c.g_value_init(&value, c.G_TYPE_INT); _ = c.g_value_init(&value, c.G_TYPE_INT);