From 227c448052350f7e74ec57fcc8dc0c035720f3fa Mon Sep 17 00:00:00 2001 From: Adrien Bourmault Date: Tue, 24 Jan 2023 21:54:29 +0100 Subject: [PATCH] Base window visible --- manifest.scm | 1 + src/main.c | 3 --- src/window.c | 12 ++++++------ ui/gemgraph.ui | 6 +++--- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/manifest.scm b/manifest.scm index 69a9efe..c860c56 100644 --- a/manifest.scm +++ b/manifest.scm @@ -21,5 +21,6 @@ "glib" "mesa-headers" "mesa" + "libadwaita" ) ) \ No newline at end of file diff --git a/src/main.c b/src/main.c index fa25e32..910faec 100644 --- a/src/main.c +++ b/src/main.c @@ -40,15 +40,12 @@ int main(int argc, char **argv) // bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); // textdomain (GETTEXT_PACKAGE); - //app = gtk_application_new(NULL, G_APPLICATION_DEFAULT_FLAGS); app = gem_graph_client_application_new("org.alec.gemgraph", G_APPLICATION_DEFAULT_FLAGS); //g_signal_connect(app, "activate", G_CALLBACK(on_activate), NULL); res = g_application_run(G_APPLICATION(app), argc, argv); - g_object_unref(app); - return res; } diff --git a/src/window.c b/src/window.c index 8b79d82..5f03046 100644 --- a/src/window.c +++ b/src/window.c @@ -198,8 +198,8 @@ struct _GemGraphClientWindow GtkApplicationWindow parent_instance; /* Template widgets */ - GtkHeaderBar *header_bar; - GtkLabel *label; + GtkHeaderBar *main_titlebar; + //GtkLabel *label; }; G_DEFINE_FINAL_TYPE (GemGraphClientWindow, @@ -223,10 +223,10 @@ static void gem_graph_client_window_class_init(GemGraphClientWindowClass *klass) gtk_widget_class_bind_template_child(widget_class, GemGraphClientWindow, - header_bar); - gtk_widget_class_bind_template_child(widget_class, - GemGraphClientWindow, - label); + main_titlebar); + //gtk_widget_class_bind_template_child(widget_class, + // GemGraphClientWindow, + // label); } static void gem_graph_client_window_init(GemGraphClientWindow *self) diff --git a/ui/gemgraph.ui b/ui/gemgraph.ui index 555fa73..f8e9e47 100644 --- a/ui/gemgraph.ui +++ b/ui/gemgraph.ui @@ -10,7 +10,7 @@ application-x-executable GemGraph 0.0.1 - + none @@ -43,7 +43,7 @@ - + 300 @@ -61,7 +61,7 @@ - + side_home