Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update ListField to create 2D list fields #282

Merged
merged 18 commits into from Aug 19, 2019
Merged

Update ListField to create 2D list fields #282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
869a50d
Update ListField to create 2D list fields
CalvinMT Jul 20, 2019
5708f86
Add possibility to foward (or not) mouse events over columns
CalvinMT Jul 20, 2019
9baf402
Add possibility to select an entire row
CalvinMT Jul 20, 2019
de0f211
Fix javadocs
CalvinMT Jul 20, 2019
153b17a
Fix loop going too far when columns aren't equal size
CalvinMT Jul 20, 2019
40bf443
Add possibility to set the slider inside a ListField
CalvinMT Jul 26, 2019
22a510a
Add ListField initialization tests
CalvinMT Jul 26, 2019
a963470
Add horizontal slider
CalvinMT Jul 27, 2019
b0767f1
Update javadocs
CalvinMT Jul 27, 2019
48a2262
Update constructor
CalvinMT Jul 27, 2019
4c7fa47
Fix test with appropriate constructor
CalvinMT Jul 27, 2019
4bd9034
Fix javadocs
CalvinMT Jul 27, 2019
5f68007
Remove print
CalvinMT Jul 27, 2019
322e099
Clean imports
CalvinMT Jul 27, 2019
7b08cf7
Hide horizontal slider if not needed
CalvinMT Jul 27, 2019
9c1d724
Better slider size for dropdown list fields
CalvinMT Aug 7, 2019
bbac4f6
Scrolling without selection
CalvinMT Aug 7, 2019
0590e95
Add a deselect method
CalvinMT Aug 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 9 additions & 9 deletions src/de/gurkenlabs/litiengine/gui/DropdownListField.java
View file
Open in desktop
Expand Up @@ -63,23 +63,23 @@ public Spritesheet getEntrySprite() {
}

public List<ImageComponent> getListEntries() {
return this.getContentList().getListEntries();
return this.getContentList().getListEntry(0);
}

public int getNumberOfShownElements() {
return this.numberOfShownElements;
}

public int getSelectedIndex() {
return this.getContentList().getSelection();
return this.getContentList().getSelectionRow();
}

public Object getSelectedObject() {
if (this.getContentArray().length == 0) {
return null;
}

return this.getContentArray()[this.getContentList().getSelection()];
return this.getContentArray()[this.getContentList().getSelectionRow()];
}

public boolean isArrowKeyNavigation() {
Expand Down Expand Up @@ -113,7 +113,7 @@ public void prepare() {
this.getContentList().suspend();

if (!this.getListEntries().isEmpty()) {
this.chosenElementComponent.setText(this.getListEntries().get(this.getSelectedIndex()).getText());
this.chosenElementComponent.setText(this.getListEntries().get(0).getText());
}

this.dropDownButton.onClicked(e -> this.toggleDropDown());
Expand Down Expand Up @@ -146,7 +146,7 @@ public void setSelection(final int selectionIndex) {
return;
}

this.getContentList().setSelection(selectionIndex);
this.getContentList().setSelection(0, selectionIndex);
}

public void setSelection(final Object selectedObject) {
Expand Down Expand Up @@ -182,24 +182,24 @@ private void prepareInput() {
if (this.isSuspended() || !this.isVisible() || !this.isArrowKeyNavigation() || !this.getChosenElementComponent().isHovered()) {
return;
}
this.getContentList().setSelection(this.getSelectedIndex() - 1);
this.getContentList().setSelection(0, this.getSelectedIndex() - 1);
});

Input.keyboard().onKeyTyped(KeyEvent.VK_DOWN, e -> {
if (this.isSuspended() || !this.isVisible() || !this.isArrowKeyNavigation() || !this.getChosenElementComponent().isHovered()) {
return;
}
this.getContentList().setSelection(this.getSelectedIndex() + 1);
this.getContentList().setSelection(0, this.getSelectedIndex() + 1);
});

this.onMouseWheelScrolled(e -> {
if (this.isSuspended() || !this.isVisible() || !this.getChosenElementComponent().isHovered()) {
return;
}
if (e.getEvent().getWheelRotation() < 0) {
this.getContentList().setSelection(this.getSelectedIndex() - 1);
this.getContentList().setSelection(0, this.getSelectedIndex() - 1);
} else {
this.getContentList().setSelection(this.getSelectedIndex() + 1);
this.getContentList().setSelection(0, this.getSelectedIndex() + 1);
}
return;
});
Expand Down