comparison: ui/gtk/window.c
ui/gtk/window.c
- changeset 789
- d70799b3333e
- parent 783
- 25b2da0aac15
- child 790
- 67da3f795226
equal
deleted
inserted
replaced
| 788:27f126f6e361 | 789:d70799b3333e |
|---|---|
| 234 adw_application_window_set_content(ADW_APPLICATION_WINDOW(obj->widget), splitview); | 234 adw_application_window_set_content(ADW_APPLICATION_WINDOW(obj->widget), splitview); |
| 235 | 235 |
| 236 GtkWidget *sidebar_toolbar_view = adw_toolbar_view_new(); | 236 GtkWidget *sidebar_toolbar_view = adw_toolbar_view_new(); |
| 237 adw_overlay_split_view_set_sidebar(ADW_OVERLAY_SPLIT_VIEW(splitview), sidebar_toolbar_view); | 237 adw_overlay_split_view_set_sidebar(ADW_OVERLAY_SPLIT_VIEW(splitview), sidebar_toolbar_view); |
| 238 headerbar_sidebar = adw_header_bar_new(); | 238 headerbar_sidebar = adw_header_bar_new(); |
| 239 adw_header_bar_set_show_title(ADW_HEADER_BAR(headerbar_sidebar), FALSE); | |
| 239 adw_toolbar_view_add_top_bar(ADW_TOOLBAR_VIEW(sidebar_toolbar_view), headerbar_sidebar); | 240 adw_toolbar_view_add_top_bar(ADW_TOOLBAR_VIEW(sidebar_toolbar_view), headerbar_sidebar); |
| 240 | 241 |
| 241 adw_overlay_split_view_set_content(ADW_OVERLAY_SPLIT_VIEW(splitview), content); | 242 adw_overlay_split_view_set_content(ADW_OVERLAY_SPLIT_VIEW(splitview), content); |
| 242 | 243 |
| 243 g_object_set_data(G_OBJECT(obj->widget), "ui_sidebar", sidebar_toolbar_view); | 244 g_object_set_data(G_OBJECT(obj->widget), "ui_sidebar", sidebar_toolbar_view); |
| 249 if(show_title) { | 250 if(show_title) { |
| 250 if(!strcmp(show_title, "main") && sidebar) { | 251 if(!strcmp(show_title, "main") && sidebar) { |
| 251 adw_header_bar_set_show_title(ADW_HEADER_BAR(headerbar_sidebar), FALSE); | 252 adw_header_bar_set_show_title(ADW_HEADER_BAR(headerbar_sidebar), FALSE); |
| 252 } else if(!strcmp(show_title, "sidebar")) { | 253 } else if(!strcmp(show_title, "sidebar")) { |
| 253 adw_header_bar_set_show_title(ADW_HEADER_BAR(headerbar_main), FALSE); | 254 adw_header_bar_set_show_title(ADW_HEADER_BAR(headerbar_main), FALSE); |
| 255 adw_header_bar_set_show_title(ADW_HEADER_BAR(headerbar_sidebar), TRUE); | |
| 254 } else if(!strcmp(show_title, "false")) { | 256 } else if(!strcmp(show_title, "false")) { |
| 255 adw_header_bar_set_show_title(ADW_HEADER_BAR(headerbar_sidebar), FALSE); | 257 adw_header_bar_set_show_title(ADW_HEADER_BAR(headerbar_sidebar), FALSE); |
| 256 adw_header_bar_set_show_title(ADW_HEADER_BAR(headerbar_main), FALSE); | 258 adw_header_bar_set_show_title(ADW_HEADER_BAR(headerbar_main), FALSE); |
| 257 } else { | 259 } else { |
| 258 fprintf(stderr, "Unknown value '%s' for property ui.gtk.window.showtitle\n", show_title); | 260 fprintf(stderr, "Unknown value '%s' for property ui.gtk.window.showtitle\n", show_title); |
| 259 adw_header_bar_set_show_title(ADW_HEADER_BAR(headerbar_sidebar), FALSE); | 261 adw_header_bar_set_show_title(ADW_HEADER_BAR(headerbar_sidebar), FALSE); |
| 260 } | 262 } |
| 261 } else { | 263 } else { |
| 262 adw_header_bar_set_show_title(ADW_HEADER_BAR(headerbar_main), FALSE); | 264 adw_header_bar_set_show_title(ADW_HEADER_BAR(headerbar_main), FALSE); |
| 265 if(sidebar) { | |
| 266 adw_header_bar_set_show_title(ADW_HEADER_BAR(headerbar_sidebar), TRUE); | |
| 267 } | |
| 263 } | 268 } |
| 264 | 269 |
| 265 adw_toolbar_view_add_top_bar(ADW_TOOLBAR_VIEW(toolbar_view), headerbar_main); | 270 adw_toolbar_view_add_top_bar(ADW_TOOLBAR_VIEW(toolbar_view), headerbar_main); |
| 266 g_object_set_data(G_OBJECT(obj->widget), "ui_headerbar", headerbar_main); | 271 g_object_set_data(G_OBJECT(obj->widget), "ui_headerbar", headerbar_main); |
| 267 | 272 |
| 268 if(!simple) { | 273 if(!simple) { |
| 269 ui_fill_headerbar(obj, headerbar_main); | 274 ui_fill_headerbar(obj, headerbar_sidebar, headerbar_main, headerbar_right); |
| 270 } | 275 } |
| 271 #elif GTK_MAJOR_VERSION >= 4 | 276 #elif GTK_MAJOR_VERSION >= 4 |
| 272 GtkWidget *content_box = ui_gtk_vbox_new(0); | 277 GtkWidget *content_box = ui_gtk_vbox_new(0); |
| 273 WINDOW_SET_CONTENT(obj->widget, vbox); | 278 WINDOW_SET_CONTENT(obj->widget, vbox); |
| 274 if(!simple) { | 279 if(!simple) { |
