|
|
@ -15,6 +15,7 @@ import com.fr.design.gui.icombobox.LineComboBox; |
|
|
|
import com.fr.design.gui.ilable.UILabel; |
|
|
|
import com.fr.design.gui.ilable.UILabel; |
|
|
|
import com.fr.design.layout.TableLayout; |
|
|
|
import com.fr.design.layout.TableLayout; |
|
|
|
import com.fr.design.layout.TableLayoutHelper; |
|
|
|
import com.fr.design.layout.TableLayoutHelper; |
|
|
|
|
|
|
|
import com.fr.design.mainframe.backgroundpane.NullBackgroundQuickPane; |
|
|
|
import com.fr.design.style.color.NewColorSelectBox; |
|
|
|
import com.fr.design.style.color.NewColorSelectBox; |
|
|
|
import com.fr.design.utils.gui.AdjustWorkBookDefaultStyleUtils; |
|
|
|
import com.fr.design.utils.gui.AdjustWorkBookDefaultStyleUtils; |
|
|
|
import com.fr.general.IOUtils; |
|
|
|
import com.fr.general.IOUtils; |
|
|
@ -246,7 +247,9 @@ public class BorderPane extends AbstractBasicStylePane implements GlobalNameObse |
|
|
|
style = AdjustWorkBookDefaultStyleUtils.adjustCellElement(Style.DEFAULT_STYLE); |
|
|
|
style = AdjustWorkBookDefaultStyleUtils.adjustCellElement(Style.DEFAULT_STYLE); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (backgroundPane.currentPane.isBackgroundChange()) { |
|
|
|
boolean isSetNullBackground = backgroundPane.currentPane instanceof NullBackgroundQuickPane |
|
|
|
|
|
|
|
&& !(backgroundPane.lastSelectedPane instanceof NullBackgroundQuickPane); |
|
|
|
|
|
|
|
if (backgroundPane.currentPane.isBackgroundChange() || isSetNullBackground) { |
|
|
|
style = style.deriveBackground(backgroundPane.update()); |
|
|
|
style = style.deriveBackground(backgroundPane.update()); |
|
|
|
} |
|
|
|
} |
|
|
|
if (BORDER_SET.contains(globalNameListener.getGlobalName())) { |
|
|
|
if (BORDER_SET.contains(globalNameListener.getGlobalName())) { |
|
|
|