lan/HMCL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复 JFXPopup 在 RTL 下漂移的问题 (#5328)

Browse Source
This commit is contained in:
辞庐
2026-01-27 20:42:48 +08:00
committed by GitHub
parent d2ae41c9ae
commit e9e6ef1f20
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
HMCL/src/main/java/com/jfoenix/controls/JFXPopup.java
View File

@@ -24,8 +24,10 @@ import javafx.application.Platform;
import javafx.beans.DefaultProperty; import javafx.beans.DefaultProperty;
import javafx.beans.property.ObjectProperty; import javafx.beans.property.ObjectProperty;
import javafx.beans.property.SimpleObjectProperty; import javafx.beans.property.SimpleObjectProperty;
import javafx.geometry.NodeOrientation;
import javafx.geometry.Point2D; import javafx.geometry.Point2D;
import javafx.scene.Node; import javafx.scene.Node;
import javafx.scene.Scene;
import javafx.scene.control.PopupControl; import javafx.scene.control.PopupControl;
import javafx.scene.control.Skin; import javafx.scene.control.Skin;
import javafx.scene.layout.Pane; import javafx.scene.layout.Pane;
@@ -41,7 +43,12 @@ import javafx.stage.Window;
public class JFXPopup extends PopupControl { public class JFXPopup extends PopupControl {
public enum PopupHPosition { public enum PopupHPosition {
RIGHT, LEFT RIGHT,
LEFT;
public PopupHPosition getOpposite() {
return (this == RIGHT) ? LEFT : RIGHT;
}
} }
public enum PopupVPosition { public enum PopupVPosition {
@@ -121,18 +128,21 @@ public class JFXPopup extends PopupControl {
/// @param initOffsetY on the y-axis /// @param initOffsetY on the y-axis
public void show(Node node, PopupVPosition vAlign, PopupHPosition hAlign, double initOffsetX, double initOffsetY) { public void show(Node node, PopupVPosition vAlign, PopupHPosition hAlign, double initOffsetX, double initOffsetY) {
if (!isShowing()) { if (!isShowing()) {
if (node.getScene() == null || node.getScene().getWindow() == null) { Scene scene = node.getScene();
if (scene == null || scene.getWindow() == null) {
throw new IllegalStateException("Can not show popup. The node must be attached to a scene/window."); throw new IllegalStateException("Can not show popup. The node must be attached to a scene/window.");
} }
Window parent = node.getScene().getWindow(); Window parent = scene.getWindow();
final Point2D origin = node.localToScene(0, 0); final Point2D origin = node.localToScene(0, 0);
final double anchorX = parent.getX() + origin.getX()
+ node.getScene().getX() + (hAlign == PopupHPosition.RIGHT ? ((Region) node).getWidth() : 0); boolean isRTL = node.getEffectiveNodeOrientation() == NodeOrientation.RIGHT_TO_LEFT;
final double anchorY = parent.getY() + origin.getY()
+ node.getScene() this.show(parent,
.getY() + (vAlign == PopupVPosition.BOTTOM ? ((Region) node).getHeight() : 0); parent.getX() + scene.getX() + origin.getX() + (hAlign == PopupHPosition.RIGHT ? ((Region) node).getWidth() : 0),
this.show(parent, anchorX, anchorY); parent.getY() + origin.getY() + scene.getY() + (vAlign == PopupVPosition.BOTTOM ? ((Region) node).getHeight() : 0)
((JFXPopupSkin) getSkin()).reset(vAlign, hAlign, initOffsetX, initOffsetY); );
((JFXPopupSkin) getSkin()).reset(vAlign, isRTL ? hAlign.getOpposite() : hAlign, isRTL ? -initOffsetX : initOffsetX, initOffsetY);
Platform.runLater(() -> ((JFXPopupSkin) getSkin()).animate()); Platform.runLater(() -> ((JFXPopupSkin) getSkin()).animate());
} }
} }