comparison: ui/gtk/window.c
ui/gtk/window.c
- branch
- newapi
- changeset 306
- d02e1149cdb9
- parent 302
- b00cbbfeec7a
equal
deleted
inserted
replaced
| 305:98470af75dcf | 306:d02e1149cdb9 |
|---|---|
| 39 #include <cx/mempool.h> | 39 #include <cx/mempool.h> |
| 40 | 40 |
| 41 #include "menu.h" | 41 #include "menu.h" |
| 42 #include "toolbar.h" | 42 #include "toolbar.h" |
| 43 #include "container.h" | 43 #include "container.h" |
| 44 #include "headerbar.h" | |
| 44 | 45 |
| 45 static int nwindows = 0; | 46 static int nwindows = 0; |
| 46 | 47 |
| 47 static int window_default_width = 650; | 48 static int window_default_width = 650; |
| 48 static int window_default_height = 550; | 49 static int window_default_height = 550; |
| 115 adw_application_window_set_content(ADW_APPLICATION_WINDOW(obj->widget), toolbar_view); | 116 adw_application_window_set_content(ADW_APPLICATION_WINDOW(obj->widget), toolbar_view); |
| 116 adw_toolbar_view_set_content(ADW_TOOLBAR_VIEW(toolbar_view), vbox); | 117 adw_toolbar_view_set_content(ADW_TOOLBAR_VIEW(toolbar_view), vbox); |
| 117 | 118 |
| 118 GtkWidget *headerbar = adw_header_bar_new(); | 119 GtkWidget *headerbar = adw_header_bar_new(); |
| 119 adw_toolbar_view_add_top_bar(ADW_TOOLBAR_VIEW(toolbar_view), headerbar); | 120 adw_toolbar_view_add_top_bar(ADW_TOOLBAR_VIEW(toolbar_view), headerbar); |
| 121 | |
| 122 ui_fill_headerbar(obj, headerbar); | |
| 120 #elif GTK_MAJOR_VERSION >= 4 | 123 #elif GTK_MAJOR_VERSION >= 4 |
| 121 WINDOW_SET_CONTENT(obj->widget, vbox); | 124 WINDOW_SET_CONTENT(obj->widget, vbox); |
| 122 #else | 125 #else |
| 123 gtk_container_add(GTK_CONTAINER(obj->widget), vbox); | 126 gtk_container_add(GTK_CONTAINER(obj->widget), vbox); |
| 124 | 127 |
