From 82d69aa9cbc91db3f9bacde151531a7c7fde922b Mon Sep 17 00:00:00 2001
From: Starryi <starryi@foxmail.com>
Date: Mon, 13 Apr 2020 14:20:15 +0800
Subject: [PATCH] =?UTF-8?q?MOBILE-26514=20=E4=BE=A7=E8=BE=B9=E5=AF=BC?=
 =?UTF-8?q?=E8=88=AA=E8=AE=BE=E7=BD=AE=E4=BA=86=E9=80=8F=E6=98=8E=E4=BC=9A?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E4=BF=9D=E5=AD=98=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

处理ColorSelectBox选择透明后返回空对象的问题
---
 .../ui/SidebarMobileBookMarkStyleCustomDefinePane.java    | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/SidebarMobileBookMarkStyleCustomDefinePane.java b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/SidebarMobileBookMarkStyleCustomDefinePane.java
index 817f299511..ae79160bbd 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/SidebarMobileBookMarkStyleCustomDefinePane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/SidebarMobileBookMarkStyleCustomDefinePane.java
@@ -358,9 +358,7 @@ public class SidebarMobileBookMarkStyleCustomDefinePane extends BasicBeanPane<Mo
         style.setGap((int) buttonGapSpinner.getValue());
         style.setBorderRadius((int) buttonBorderRadiusSpinner.getValue());
 
-        if (normalBackgroundColorBox.getSelectObject() != null) {
-            style.setBackgroundColor(normalBackgroundColorBox.getSelectObject());
-        }
+        style.setBackgroundColor(normalBackgroundColorBox.getSelectObject());
         style.setOpacity((int) normalOpacitySpinner.getValue());
         style.setBorderLineStyle(normalBorderWidthComBox.getSelectedLineStyle());
         style.setBorderColor(normalBorderColorBox.getSelectObject());
@@ -374,9 +372,7 @@ public class SidebarMobileBookMarkStyleCustomDefinePane extends BasicBeanPane<Mo
         style.setFontItalic(normalFontItalicButton.isSelected());
         style.setFontBold(normalFontBoldButton.isSelected());
 
-        if (selectedBackgroundColorBox.getSelectObject() != null) {
-            style.setSelectedBackgroundColor(selectedBackgroundColorBox.getSelectObject());
-        }
+        style.setSelectedBackgroundColor(selectedBackgroundColorBox.getSelectObject());
         style.setSelectedOpacity((int) selectedOpacitySpinner.getValue());
         style.setSelectedBorderLineStyle(selectedBorderWidthComBox.getSelectedLineStyle());
         style.setSelectedBorderColor(selectedBorderColorBox.getSelectObject());