From cb2f514433ebba7f2ac2842fab5e9ea5b77104e4 Mon Sep 17 00:00:00 2001
From: axpoems <145597137+axpoems@users.noreply.github.com>
Date: Sat, 14 Sep 2024 19:30:00 +0200
Subject: [PATCH 1/2] Move notifications settings menu closer to ellipsis menu

---
 .../main/content/bisq_easy/offerbook/BisqEasyOfferbookView.java  | 1 +
 .../src/main/java/bisq/desktop/main/content/chat/ChatView.java   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/bisq_easy/offerbook/BisqEasyOfferbookView.java b/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/bisq_easy/offerbook/BisqEasyOfferbookView.java
index d1081da796..ee427e70dd 100644
--- a/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/bisq_easy/offerbook/BisqEasyOfferbookView.java
+++ b/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/bisq_easy/offerbook/BisqEasyOfferbookView.java
@@ -103,6 +103,7 @@ protected void configTitleHBox() {
         createOfferButton.setMinSize(Button.USE_PREF_SIZE, Button.USE_PREF_SIZE);
 
         HBox.setHgrow(headerTitle, Priority.ALWAYS);
+        HBox.setMargin(notificationsSettingsMenu, new Insets(0, 0, 0, -5));
         titleHBox.getChildren().setAll(headerTitle, createOfferButton, ellipsisMenu, notificationsSettingsMenu);
     }
 
diff --git a/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/chat/ChatView.java b/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/chat/ChatView.java
index 1b1db92225..4dd1b9958a 100644
--- a/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/chat/ChatView.java
+++ b/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/chat/ChatView.java
@@ -53,6 +53,7 @@ protected void configTitleHBox() {
         searchBox.setPrefHeight(searchBoxHeight);
 
         HBox.setMargin(channelIcon, new Insets(0, 0, -2, 5));
+        HBox.setMargin(notificationsSettingsMenu, new Insets(0, 0, 0, -5));
         titleHBox.getChildren().addAll(channelIcon, headerTitle, searchBox, ellipsisMenu, notificationsSettingsMenu);
     }
 

From 68a4e79ef78843f930a4d9d400f05716d40c3f5a Mon Sep 17 00:00:00 2001
From: axpoems <145597137+axpoems@users.noreply.github.com>
Date: Sat, 14 Sep 2024 19:47:38 +0200
Subject: [PATCH 2/2] Add title inside notifications settings menu

---
 .../java/bisq/desktop/main/content/chat/BaseChatView.java    | 5 ++++-
 apps/desktop/desktop/src/main/resources/css/chat.css         | 4 ++++
 i18n/src/main/resources/chat.properties                      | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/chat/BaseChatView.java b/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/chat/BaseChatView.java
index 31d3c4862a..2cd8752a2d 100644
--- a/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/chat/BaseChatView.java
+++ b/apps/desktop/desktop/src/main/java/bisq/desktop/main/content/chat/BaseChatView.java
@@ -22,6 +22,7 @@
 import bisq.desktop.common.view.NavigationView;
 import bisq.desktop.components.controls.DropdownBisqMenuItem;
 import bisq.desktop.components.controls.DropdownMenu;
+import bisq.desktop.components.controls.DropdownTitleMenuItem;
 import bisq.desktop.components.controls.SearchBox;
 import bisq.i18n.Res;
 import javafx.css.PseudoClass;
@@ -182,6 +183,7 @@ private void setUpEllipsisMenu() {
     }
 
     private void setupNotificationsSettingMenu() {
+        DropdownTitleMenuItem title = new DropdownTitleMenuItem(Res.get("chat.notificationsSettingsMenu.title"));
         globalDefault = new NotificationSettingMenuItem("check-white", "check-white",
                 Res.get("chat.notificationsSettingsMenu.globalDefault"), ChatChannelNotificationType.GLOBAL_DEFAULT);
         all = new NotificationSettingMenuItem("check-white", "check-white",
@@ -190,7 +192,8 @@ private void setupNotificationsSettingMenu() {
                 Res.get("chat.notificationsSettingsMenu.mention"), ChatChannelNotificationType.MENTION);
         off = new NotificationSettingMenuItem("check-white", "check-white",
                 Res.get("chat.notificationsSettingsMenu.off"), ChatChannelNotificationType.OFF);
-        notificationsSettingsMenu.addMenuItems(globalDefault, all, mention, off);
+        notificationsSettingsMenu.getStyleClass().add("notifications-settings-menu");
+        notificationsSettingsMenu.addMenuItems(title, globalDefault, all, mention, off);
         notificationsSettingsMenu.setTooltip(Res.get("chat.notificationsSettingsMenu.tooltip"));
     }
 
diff --git a/apps/desktop/desktop/src/main/resources/css/chat.css b/apps/desktop/desktop/src/main/resources/css/chat.css
index 1c013e64c0..7a2e5b6676 100644
--- a/apps/desktop/desktop/src/main/resources/css/chat.css
+++ b/apps/desktop/desktop/src/main/resources/css/chat.css
@@ -329,6 +329,10 @@
     -fx-background-color: -bisq-dark-grey-20;
 }
 
+.notifications-settings-menu .dropdown-menu-popup {
+    -fx-padding: 18 8 8 8 !important;
+}
+
 
 /*******************************************************************************
  * Header                                                                      *
diff --git a/i18n/src/main/resources/chat.properties b/i18n/src/main/resources/chat.properties
index 93a4397d89..feec5bd41c 100644
--- a/i18n/src/main/resources/chat.properties
+++ b/i18n/src/main/resources/chat.properties
@@ -133,6 +133,7 @@ chat.ellipsisMenu.chatRules=Chat rules
 chat.ellipsisMenu.channelInfo=Channel info
 chat.ellipsisMenu.tradeGuide=Trade guide
 
+chat.notificationsSettingsMenu.title=Notification options:
 chat.notificationsSettingsMenu.tooltip=Notification options
 chat.notificationsSettingsMenu.globalDefault=Use default
 chat.notificationsSettingsMenu.all=All messages