zdm/envoy
zdm
/
envoy
Archived
3
Fork 0
Code Issues 22 Pull Requests Releases 1 Wiki Activity

Implemented some requested changes

This commit is contained in:
Maximilian P. Käfer 2020-10-03 20:28:43 +02:00
parent 3d987985ff
commit 51b189e8f5
Signed by: mpk
GPG Key ID: 035869C949377C5C
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
client/src/main/java/envoy/client/ui/control/QuickSelectControl.java
View File

@ -11,17 +11,18 @@ import envoy.client.util.IconUtil;
import envoy.data.User; import envoy.data.User;
/** /**
* Displays a user as a quickSelectControl which is used in the quickSelectList. * Displays an {@link User} as a quickSelectControl which is used in the
* quickSelectList.
* *
* @author Maximilian Käfer * @author Maximilian Käfer
* @since Envoy Client v0.3-beta * @since Envoy Client v0.3-beta
*/ */
public class QuickSelectControl extends VBox { public class QuickSelectControl extends VBox {
User user; private User user;
/** /**
* Creates an instance of the {@link QuickSelectControl}. * Creates an instance of the {@code QuickSelectControl}.
* *
* @param user the user whose data is used to create this instance. * @param user the user whose data is used to create this instance.
* @param tab the parent tab ({@link GroupCreationTab}). * @param tab the parent tab ({@link GroupCreationTab}).
@ -49,7 +50,6 @@ public class QuickSelectControl extends VBox {
clip.setArcHeight(32); clip.setArcHeight(32);
clip.setArcWidth(32); clip.setArcWidth(32);
contactProfilePic.setClip(clip); contactProfilePic.setClip(clip);
setAlignment(Pos.TOP_CENTER);
picHold.getChildren().add(contactProfilePic); picHold.getChildren().add(contactProfilePic);
stackPane.getChildren().add(picHold); stackPane.getChildren().add(picHold);
@ -59,7 +59,7 @@ public class QuickSelectControl extends VBox {
hBox.setMinHeight(12); hBox.setMinHeight(12);
var region = new Region(); var region = new Region();
hBox.getChildren().add(region); hBox.getChildren().add(region);
hBox.setHgrow(region, Priority.ALWAYS); HBox.setHgrow(region, Priority.ALWAYS);
var removeBtn = new Button(); var removeBtn = new Button();
removeBtn.setPrefSize(12, 12); removeBtn.setPrefSize(12, 12);
@ -85,7 +85,7 @@ public class QuickSelectControl extends VBox {
} }
/** /**
* @return the user whose data is used in this instance. * @return the user whose data is used in this instance
* @since Envoy Client v0.3-beta * @since Envoy Client v0.3-beta
*/ */
public User getUser() { return user; } public User getUser() { return user; }

18
client/src/main/java/envoy/client/ui/controller/GroupCreationTab.java
View File

@ -7,6 +7,7 @@ import java.util.stream.Collectors;
import javafx.application.Platform; import javafx.application.Platform;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.scene.control.*; import javafx.scene.control.*;
import javafx.scene.input.MouseEvent;
import javafx.scene.layout.HBox; import javafx.scene.layout.HBox;
import envoy.client.data.*; import envoy.client.data.*;
@ -82,6 +83,7 @@ public class GroupCreationTab implements EventListener {
.map(User.class::cast) .map(User.class::cast)
.collect(Collectors.toList())); .collect(Collectors.toList()));
resizeQuickSelectSpace(0); resizeQuickSelectSpace(0);
quickSelectList.addEventFilter(MouseEvent.MOUSE_PRESSED, evt -> evt.consume());
} }
/** /**
@ -91,11 +93,13 @@ public class GroupCreationTab implements EventListener {
*/ */
@FXML @FXML
private void userListClicked() { private void userListClicked() {
createButton.setDisable(userList.getSelectionModel().isEmpty() || groupNameField.getText().isBlank()); if (userList.getSelectionModel().getSelectedItem() != null) {
quickSelectList.getItems().add(new QuickSelectControl(userList.getSelectionModel().getSelectedItem(), this)); quickSelectList.getItems().add(new QuickSelectControl(userList.getSelectionModel().getSelectedItem(), this));
resizeQuickSelectSpace(60); createButton.setDisable(quickSelectList.getItems().isEmpty() || groupNameField.getText().isBlank());
userList.getItems().remove(userList.getSelectionModel().getSelectedItem()); resizeQuickSelectSpace(60);
userList.getSelectionModel().clearSelection(); userList.getItems().remove(userList.getSelectionModel().getSelectedItem());
userList.getSelectionModel().clearSelection();
}
} }
/** /**
@ -105,7 +109,7 @@ public class GroupCreationTab implements EventListener {
* @since Envoy Client v0.1-beta * @since Envoy Client v0.1-beta
*/ */
@FXML @FXML
private void textUpdated() { createButton.setDisable(quickSelectList.getItems().size() == 0 || groupNameField.getText().isBlank()); } private void textUpdated() { createButton.setDisable(quickSelectList.getItems().isEmpty() || groupNameField.getText().isBlank()); }
/** /**
* Sends a {@link GroupCreation} to the server and closes this scene. * Sends a {@link GroupCreation} to the server and closes this scene.
@ -173,7 +177,7 @@ public class GroupCreationTab implements EventListener {
public void removeFromQuickSelection(QuickSelectControl element) { public void removeFromQuickSelection(QuickSelectControl element) {
quickSelectList.getItems().remove(element); quickSelectList.getItems().remove(element);
userList.getItems().add(element.getUser()); userList.getItems().add(element.getUser());
if (quickSelectList.getItems().size() == 0) { if (quickSelectList.getItems().isEmpty()) {
resizeQuickSelectSpace(0); resizeQuickSelectSpace(0);
createButton.setDisable(true); createButton.setDisable(true);
} }