Mercurial > hg > idav / file diff

--- a/ui/gtk/headerbar.c	Sun Aug 24 15:24:16 2025 +0200
+++ b/ui/gtk/headerbar.c	Sat Oct 04 14:52:59 2025 +0200
@@ -31,21 +31,70 @@
 #include "button.h"
 #include "menu.h"
 
+#include "../ui/properties.h"
+
 #if GTK_CHECK_VERSION(3, 10, 0)
     
-void ui_fill_headerbar(UiObject *obj, GtkWidget *headerbar) {
+void ui_fill_headerbar(UiObject *obj, GtkWidget *sidebar_headerbar, GtkWidget *main_headerbar, GtkWidget *right_headerbar) {
+    CxList *sidebar_left_defaults = uic_get_toolbar_defaults(UI_TOOLBAR_SIDEBAR_LEFT);
+    CxList *sidebar_right_defaults = uic_get_toolbar_defaults(UI_TOOLBAR_SIDEBAR_RIGHT);
+    
     CxList *left_defaults = uic_get_toolbar_defaults(UI_TOOLBAR_LEFT);
     CxList *center_defaults = uic_get_toolbar_defaults(UI_TOOLBAR_CENTER);
     CxList *right_defaults = uic_get_toolbar_defaults(UI_TOOLBAR_RIGHT);
     
-    ui_headerbar_add_items(obj, headerbar, left_defaults, UI_TOOLBAR_LEFT);
-    ui_headerbar_add_items(obj, headerbar, center_defaults, UI_TOOLBAR_CENTER);
-    
+    CxList *rightpanel_left_defaults = uic_get_toolbar_defaults(UI_TOOLBAR_RIGHTPANEL_LEFT);
+    CxList *rightpanel_center_defaults = uic_get_toolbar_defaults(UI_TOOLBAR_RIGHTPANEL_CENTER);
+    CxList *rightpanel_right_defaults = uic_get_toolbar_defaults(UI_TOOLBAR_RIGHTPANEL_RIGHT);
+
     UiToolbarMenuItem *appmenu = uic_get_appmenu();
-    if(appmenu) {
-        ui_add_headerbar_menu(headerbar, NULL, appmenu, obj, UI_TOOLBAR_RIGHT);
+    const char *appmenu_pos_str = ui_get_property("ui.gtk.window.appmenu.position");
+    int appmenu_pos = UI_TOOLBAR_RIGHT;
+    if(sidebar_headerbar) {
+        appmenu_pos = UI_TOOLBAR_SIDEBAR_RIGHT;
+    } else if(right_headerbar) {
+        appmenu_pos = UI_TOOLBAR_RIGHTPANEL_RIGHT;
+    }
+    if(appmenu_pos_str) {
+        if(!strcmp(appmenu_pos_str, "sidebar") && sidebar_headerbar) {
+            appmenu_pos = UI_TOOLBAR_SIDEBAR_RIGHT;
+        } else if(!strcmp(appmenu_pos_str, "main")) {
+            appmenu_pos = UI_TOOLBAR_RIGHT;
+        } else if(!strcmp(appmenu_pos_str, "rightpanel") && right_headerbar) {
+            appmenu_pos = UI_TOOLBAR_RIGHTPANEL_RIGHT;
+        }
+    }
+    
+    // main toolbar
+    ui_headerbar_add_items(obj, main_headerbar, left_defaults, UI_TOOLBAR_LEFT);
+    ui_headerbar_add_items(obj, main_headerbar, center_defaults, UI_TOOLBAR_CENTER);
+    
+    if(appmenu && appmenu_pos == UI_TOOLBAR_RIGHT) {
+        ui_add_headerbar_menu(main_headerbar, NULL, appmenu, obj, UI_TOOLBAR_RIGHT);
     }
-    ui_headerbar_add_items(obj, headerbar, right_defaults, UI_TOOLBAR_RIGHT);
+    ui_headerbar_add_items(obj, main_headerbar, right_defaults, UI_TOOLBAR_RIGHT);
+    
+    // sidebar
+    if(sidebar_headerbar) {
+        // ui_headerbar_add_items pos parameter uses only UI_TOOLBAR_LEFT, UI_TOOLBAR_CENTER, UI_TOOLBAR_RIGHT
+        ui_headerbar_add_items(obj, sidebar_headerbar, sidebar_left_defaults, UI_TOOLBAR_LEFT);
+
+        if(appmenu && appmenu_pos == UI_TOOLBAR_SIDEBAR_RIGHT) {
+            ui_add_headerbar_menu(sidebar_headerbar, NULL, appmenu, obj, UI_TOOLBAR_RIGHT);
+        }
+        ui_headerbar_add_items(obj, sidebar_headerbar, sidebar_right_defaults, UI_TOOLBAR_RIGHT);
+    }
+    
+    // right panel
+    if(right_headerbar) {
+        ui_headerbar_add_items(obj, right_headerbar, rightpanel_left_defaults, UI_TOOLBAR_LEFT);
+        ui_headerbar_add_items(obj, right_headerbar, rightpanel_center_defaults, UI_TOOLBAR_CENTER);
+
+        if(appmenu && appmenu_pos == UI_TOOLBAR_RIGHTPANEL_RIGHT) {
+            ui_add_headerbar_menu(right_headerbar, NULL, appmenu, obj, UI_TOOLBAR_RIGHT);
+        }
+        ui_headerbar_add_items(obj, right_headerbar, rightpanel_right_defaults, UI_TOOLBAR_RIGHT);
+    }
 }
 
 static void create_item(UiObject *obj, GtkWidget *headerbar, GtkWidget *box, UiToolbarItemI *i, enum UiToolbarPos pos) {