Merge remote-tracking branch 'origin/Main-UI' into Main-UI
This commit is contained in:
@@ -14,7 +14,7 @@ public final class AvatarFX {
|
|||||||
|
|
||||||
Circle c = new Circle();
|
Circle c = new Circle();
|
||||||
c.radiusProperty().bind(Bindings.min(iv.fitWidthProperty(), iv.fitHeightProperty()).divide(2));
|
c.radiusProperty().bind(Bindings.min(iv.fitWidthProperty(), iv.fitHeightProperty()).divide(2));
|
||||||
c.centerXProperty().bind(iv.fitWidthProperty().divide(3));
|
c.centerXProperty().bind(iv.fitWidthProperty().divide(2));
|
||||||
c.centerYProperty().bind(iv.fitHeightProperty().divide(2));
|
c.centerYProperty().bind(iv.fitHeightProperty().divide(2));
|
||||||
iv.setClip(c);
|
iv.setClip(c);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -83,6 +83,13 @@ public class ChatPageController {
|
|||||||
@FXML
|
@FXML
|
||||||
private MenuItem archiveItem;
|
private MenuItem archiveItem;
|
||||||
|
|
||||||
|
// ===== Group & Channel more button =====
|
||||||
|
@FXML private MenuItem viewGroupItem;
|
||||||
|
@FXML private MenuItem leaveGroupItem;
|
||||||
|
|
||||||
|
@FXML private MenuItem viewChannelItem;
|
||||||
|
@FXML private MenuItem leaveChannelItem;
|
||||||
|
|
||||||
// ===== send icon =====
|
// ===== send icon =====
|
||||||
@FXML
|
@FXML
|
||||||
private ImageView sendIcon;
|
private ImageView sendIcon;
|
||||||
@@ -842,7 +849,7 @@ public class ChatPageController {
|
|||||||
} else {
|
} else {
|
||||||
setDefaultHeaderAvatarByType(entry.getType());
|
setDefaultHeaderAvatarByType(entry.getType());
|
||||||
}
|
}
|
||||||
AvatarFX.circleClip(userAvatar, 40);
|
AvatarFX.circleClip(userAvatar, 36);
|
||||||
|
|
||||||
|
|
||||||
// حالت اولیه (بدون انتظار هدر)
|
// حالت اولیه (بدون انتظار هدر)
|
||||||
@@ -1043,7 +1050,7 @@ public class ChatPageController {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
final String finalTargetId = targetId; // 👈 capture for use in the FX thread
|
final String finalTargetId = targetId;
|
||||||
|
|
||||||
new Thread(() -> {
|
new Thread(() -> {
|
||||||
JSONObject resp = ActionHandler.sendWithResponse(req);
|
JSONObject resp = ActionHandler.sendWithResponse(req);
|
||||||
|
|||||||
Reference in New Issue
Block a user