Merge pull request #2797 from axpoems/add-more-bg

Add missing backgrounds in Support and User Options sections
bisq-network · Sep 9, 2024 · 071fe80 · 071fe80
2 parents b47f759 + ee6302f
commit 071fe80
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 15 deletions.
diff --git a/...ktop/desktop/src/main/java/bisq/desktop/main/content/support/resources/ResourcesView.java b/...ktop/desktop/src/main/java/bisq/desktop/main/content/support/resources/ResourcesView.java
@@ -43,9 +43,8 @@ public class ResourcesView extends View<VBox, ResourcesModel, ResourcesControlle
             openLogFileButton, openTorLogFileButton, openDataDirButton, chatRules, tradeGuide, walletGuide, license, tac;
 
     public ResourcesView(ResourcesModel model, ResourcesController controller) {
-        super(new VBox(50), model, controller);
+        super(new VBox(), model, controller);
 
-        root.setPadding(new Insets(0, 40, 40, 40));
         root.setAlignment(Pos.TOP_LEFT);
 
         Label guidesHeadline = SettingsViewUtils.getHeadline(Res.get("support.resources.guides.headline"));
@@ -92,13 +91,17 @@ public ResourcesView(ResourcesModel model, ResourcesController controller) {
         VBox.setMargin(guidesBox, value);
         VBox.setMargin(legalBox, value);
         VBox.setMargin(resourcesBox, value);
-        root.getChildren().addAll(
-                guidesHeadline, SettingsViewUtils.getLineAfterHeadline(root.getSpacing()), guidesBox,
-                localDataHeadline, SettingsViewUtils.getLineAfterHeadline(root.getSpacing()), localDataBox,
-                backupHeadline, SettingsViewUtils.getLineAfterHeadline(root.getSpacing()), backupBox,
-                resourcesHeadline, SettingsViewUtils.getLineAfterHeadline(root.getSpacing()), resourcesBox,
-                legalHeadline, SettingsViewUtils.getLineAfterHeadline(root.getSpacing()), legalBox
+        VBox contentBox = new VBox(50);
+        contentBox.getChildren().addAll(
+                guidesHeadline, SettingsViewUtils.getLineAfterHeadline(contentBox.getSpacing()), guidesBox,
+                localDataHeadline, SettingsViewUtils.getLineAfterHeadline(contentBox.getSpacing()), localDataBox,
+                backupHeadline, SettingsViewUtils.getLineAfterHeadline(contentBox.getSpacing()), backupBox,
+                resourcesHeadline, SettingsViewUtils.getLineAfterHeadline(contentBox.getSpacing()), resourcesBox,
+                legalHeadline, SettingsViewUtils.getLineAfterHeadline(contentBox.getSpacing()), legalBox
         );
+        contentBox.getStyleClass().add("bisq-common-bg");
+        root.getChildren().add(contentBox);
+        root.setPadding(new Insets(0, 40, 20, 40));
     }
 
     @Override

diff --git a/...op/desktop/src/main/java/bisq/desktop/main/content/user/accounts/PaymentAccountsView.java b/...op/desktop/src/main/java/bisq/desktop/main/content/user/accounts/PaymentAccountsView.java
@@ -47,7 +47,7 @@ public class PaymentAccountsView extends View<VBox, PaymentAccountsModel, Paymen
     private Subscription selectedAccountPin, noAccountsSetupPin;
 
     public PaymentAccountsView(PaymentAccountsModel model, PaymentAccountsController controller) {
-        super(new VBox(20), model, controller);
+        super(new VBox(0), model, controller);
 
         root.setAlignment(Pos.TOP_LEFT);
         root.setPadding(new Insets(0, 40, 40, 40));
@@ -107,7 +107,11 @@ public String toString(Account<?, ? extends PaymentMethod<?>> object) {
         deletedButton = new Button(Res.get("user.paymentAccounts.deleteAccount"));
 
         buttonsHBox = new HBox(20, saveButton, deletedButton);
-        root.getChildren().addAll(headline, noAccountsVBox, largeCreateButton, selectionButtonHBox, accountData, buttonsHBox);
+        VBox contentBox = new VBox(20);
+        contentBox.getChildren().addAll(headline, noAccountsVBox, largeCreateButton, selectionButtonHBox, accountData, buttonsHBox);
+        contentBox.getStyleClass().add("bisq-common-bg");
+        root.getChildren().add(contentBox);
+        root.setPadding(new Insets(0, 40, 20, 40));
     }
 
     @Override

diff --git a/...op/desktop/src/main/java/bisq/desktop/main/content/user/user_profile/UserProfileView.java b/...op/desktop/src/main/java/bisq/desktop/main/content/user/user_profile/UserProfileView.java
@@ -72,19 +72,24 @@ public class UserProfileView extends View<HBox, UserProfileModel, UserProfileCon
     private Subscription reputationScorePin, useDeleteTooltipPin, selectedChatUserIdentityPin, isValidSelectionPin;
 
     public UserProfileView(UserProfileModel model, UserProfileController controller) {
-        super(new HBox(20), model, controller);
+        super(new HBox(), model, controller);
 
-        root.setAlignment(Pos.TOP_LEFT);
-        root.setPadding(new Insets(20, 40, 40, 40));
+        HBox contentBox = new HBox(20);
+        contentBox.getStyleClass().add("bisq-common-bg");
+        contentBox.setPadding(new Insets(0, 40, 20, 40));
+        HBox.setHgrow(contentBox, Priority.ALWAYS);
+
+        root.getChildren().add(contentBox);
+        root.setPadding(new Insets(0, 40, 20, 40));
 
         catHashImageView = new ImageView();
         catHashImageView.setFitWidth(UserProfileModel.CAT_HASH_IMAGE_SIZE);
         catHashImageView.setFitHeight(catHashImageView.getFitWidth());
-        root.getChildren().add(catHashImageView);
+        contentBox.getChildren().add(catHashImageView);
 
         formVBox = new VBox(25);
         HBox.setHgrow(formVBox, Priority.ALWAYS);
-        root.getChildren().add(formVBox);
+        contentBox.getChildren().add(formVBox);
 
         createNewProfileButton = new Button(Res.get("user.userProfile.createNewProfile"));
         createNewProfileButton.getStyleClass().addAll("outlined-button");