added tab_bar to client struct

This commit is contained in:
WanderingPenwing 2024-08-03 12:13:09 +02:00
parent c9b88e0100
commit 380edc0804

12
surf.c
View file

@ -149,6 +149,7 @@ typedef struct Client {
struct Client *next; struct Client *next;
GList *tabs; GList *tabs;
int selected_tab; int selected_tab;
GtkWidget *tab_bar;
} Client; } Client;
typedef struct { typedef struct {
@ -388,16 +389,15 @@ void free_all_tabs(Client *client) {
client->tabs = NULL; client->tabs = NULL;
} }
GtkWidget* create_tab_bar_view(GList *tabs, int selected_tab) { GtkWidget* create_tab_bar_view(GList *tabs, int selected_tab, GtkWidget *tab_bar) {
GdkRGBA bg_color; GdkRGBA bg_color, fg_color;
gdk_rgba_parse(&bg_color, tab_bar_color[0]); gdk_rgba_parse(&bg_color, tab_bar_color[0]);
GdkRGBA fg_color;
gdk_rgba_parse(&fg_color, tab_bar_color[1]); gdk_rgba_parse(&fg_color, tab_bar_color[1]);
GtkWidget *tab_bar_container = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); GtkWidget *tab_bar_container = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_set_size_request(tab_bar_container, -1, tab_bar_height + tab_spacer_height); gtk_widget_set_size_request(tab_bar_container, -1, tab_bar_height + tab_spacer_height);
GtkWidget *tab_bar = gtk_grid_new(); tab_bar = gtk_grid_new();
gtk_widget_override_background_color(tab_bar, GTK_STATE_FLAG_NORMAL, &bg_color); gtk_widget_override_background_color(tab_bar, GTK_STATE_FLAG_NORMAL, &bg_color);
gtk_widget_set_size_request(tab_bar, -1, tab_bar_height); // Set the height of the black bar gtk_widget_set_size_request(tab_bar, -1, tab_bar_height); // Set the height of the black bar
gtk_grid_set_column_spacing(tab_bar, 10); gtk_grid_set_column_spacing(tab_bar, 10);
@ -1537,7 +1537,7 @@ showview(WebKitWebView *v, Client *c)
GdkWindow *gwin; GdkWindow *gwin;
// Create the black bar using the separate function // Create the black bar using the separate function
GtkWidget *tab_bar = create_tab_bar_view(c->tabs, c->selected_tab); GtkWidget *tab_bar_container = create_tab_bar_view(c->tabs, c->selected_tab, c->tab_bar);
// Create a container to hold the black bar and the WebKitWebView // Create a container to hold the black bar and the WebKitWebView
GtkWidget *vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0); GtkWidget *vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
@ -1549,7 +1549,7 @@ showview(WebKitWebView *v, Client *c)
c->win = createwindow(c); c->win = createwindow(c);
// Add the black bar and the WebKitWebView to the container // Add the black bar and the WebKitWebView to the container
gtk_box_pack_start(GTK_BOX(vbox), tab_bar, FALSE, FALSE, 0); gtk_box_pack_start(GTK_BOX(vbox), tab_bar_container, FALSE, FALSE, 0);
gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(c->view), TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(vbox), GTK_WIDGET(c->view), TRUE, TRUE, 0);
// Add the container to the main window // Add the container to the main window