diff --git a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java b/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java index 20d2af94f..d308cbe00 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java +++ b/designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java @@ -310,7 +310,6 @@ public class PreferencePane extends BasicPane { gcButton.setEnabled(gcEnableCheckBox.isSelected()); } }); - //集群下禁用 if (ClusterBridge.isClusterMode()) { gcEnableCheckBox.setEnabled(false); diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/SyntaxView.java b/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/SyntaxView.java index fcae55615..4ee6fe978 100644 --- a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/SyntaxView.java +++ b/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rsyntaxtextarea/SyntaxView.java @@ -374,7 +374,7 @@ public class SyntaxView extends View implements TabExpander, if (host.isCodeFoldingEnabled()) { visibleLineCount -= host.getFoldManager().getHiddenLineCount(); } - return visibleLineCount * lineHeight; + return (float) visibleLineCount * lineHeight; default: throw new IllegalArgumentException("Invalid axis: " + axis); }