dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3539 from refinedmods/fix/GH-3537/search-box

Browse Source 
Fix grid input handling
This commit is contained in:
Raoul
2023-07-07 21:16:22 +02:00
committed by GitHub
parent 53adc64e9c 27b5085092
commit 3dee4d792f
14 changed files with 24 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View File

@@ -8,7 +8,7 @@ on:
types: [ opened, synchronize, reopened ]
jobs:
build:
uses: refinedmods/refinedarchitect/.github/workflows/build.yml@v0.6.0
uses: refinedmods/refinedarchitect/.github/workflows/build.yml@v0.7.1
with:
mutation-testing: false
secrets: inherit

2
.github/workflows/draft-release.yml vendored
View File

@@ -17,7 +17,7 @@ on:
type: string
jobs:
draft:
uses: refinedmods/refinedarchitect/.github/workflows/draft-release.yml@v0.6.0
uses: refinedmods/refinedarchitect/.github/workflows/draft-release.yml@v0.7.1
with:
release-type: ${{ inputs.release-type }}
version-number-override: ${{ inputs.version-number-override }}

2
.github/workflows/issue-for-unsupported-version.yml vendored
View File

@@ -4,4 +4,4 @@ on:
types: [ labeled, unlabeled, reopened ]
jobs:
unsupported-labeler:
uses: refinedmods/refinedarchitect/.github/workflows/issue-for-unsupported-version.yml@v0.6.0
uses: refinedmods/refinedarchitect/.github/workflows/issue-for-unsupported-version.yml@v0.7.1

2
.github/workflows/publish-release.yml vendored
View File

@@ -7,7 +7,7 @@ on:
- closed
jobs:
publish-release:
uses: refinedmods/refinedarchitect/.github/workflows/publish-release.yml@v0.6.0
uses: refinedmods/refinedarchitect/.github/workflows/publish-release.yml@v0.7.1
secrets: inherit
with:
project-name: 'Refined Storage'

2
.github/workflows/resolved-issue-locking.yml vendored
View File

@@ -4,4 +4,4 @@ on:
- cron: '0 0 * * *'
jobs:
lock:
uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.6.0
uses: refinedmods/refinedarchitect/.github/workflows/resolved-issue-locking.yml@v0.7.1

2
.github/workflows/validate-branch-name.yml vendored
View File

@@ -2,4 +2,4 @@ name: Validate branch name
on: [ pull_request ]
jobs:
validate-branch-name:
uses: refinedmods/refinedarchitect/.github/workflows/validate-branch-name.yml@v0.6.0
uses: refinedmods/refinedarchitect/.github/workflows/validate-branch-name.yml@v0.7.1

4
.github/workflows/validate-changelog.yml vendored
View File

@@ -4,4 +4,6 @@ on:
types: [ opened, synchronize, reopened, ready_for_review, labeled, unlabeled ]
jobs:
validate-changelog:
uses: refinedmods/refinedarchitect/.github/workflows/validate-changelog.yml@v0.6.0
uses: refinedmods/refinedarchitect/.github/workflows/validate-changelog.yml@v0.7.1
with:
validation-level: 'warn'

2
.github/workflows/validate-commit-messages.yml vendored
View File

@@ -2,4 +2,4 @@ name: Validate commit messages
on: [ pull_request ]
jobs:
validate-commit-messages:
uses: refinedmods/refinedarchitect/.github/workflows/validate-commit-messages.yml@v0.6.0
uses: refinedmods/refinedarchitect/.github/workflows/validate-commit-messages.yml@v0.7.1

4
CHANGELOG.md
View File

@@ -7,6 +7,10 @@ to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## [Unreleased]
### Fixed
- Fixed not being able to type "e" in Grid search box.
## [1.12.2] - 2023-07-05
### Fixed

2
build.gradle
View File

@@ -1,4 +1,4 @@
apply from: "https://raw.githubusercontent.com/refinedmods/refinedarchitect/v0.6.0/helper.gradle"
apply from: "https://raw.githubusercontent.com/refinedmods/refinedarchitect/v0.7.1/helper.gradle"
repositories {
maven {

2
src/main/java/com/refinedmods/refinedstorage/screen/DetectorScreen.java
View File

@@ -81,7 +81,7 @@ public class DetectorScreen extends BaseScreen<DetectorContainerMenu> {
return true;
}
if (amountField.keyPressed(key, scanCode, modifiers)) {
if (amountField.keyPressed(key, scanCode, modifiers) || amountField.canConsumeInput()) {
return true;
}

2
src/main/java/com/refinedmods/refinedstorage/screen/FilterScreen.java
View File

@@ -101,7 +101,7 @@ public class FilterScreen extends BaseScreen<FilterContainerMenu> {
return true;
}
if (nameField.keyPressed(key, scanCode, modifiers)) {
if (nameField.keyPressed(key, scanCode, modifiers) || nameField.canConsumeInput()) {
return true;
}

1
src/main/java/com/refinedmods/refinedstorage/screen/grid/GridScreen.java
View File

@@ -686,7 +686,6 @@ public class GridScreen extends BaseScreen<GridContainerMenu> implements IScreen
if (searchField.keyPressed(key, scanCode, modifiers)) {
return true;
}
return super.keyPressed(key, scanCode, modifiers);
}

24
src/main/java/com/refinedmods/refinedstorage/screen/widget/SearchWidget.java
View File

@@ -65,57 +65,47 @@ public class SearchWidget extends EditBox {
@Override
public boolean keyPressed(int keyCode, int scanCode, int modifier) {
boolean result = super.keyPressed(keyCode, scanCode, modifier);
if (super.keyPressed(keyCode, scanCode, modifier)) {
return true;
}
if (isFocused()) {
if (keyCode == GLFW.GLFW_KEY_UP) {
updateHistory(-1);
result = true;
} else if (keyCode == GLFW.GLFW_KEY_DOWN) {
updateHistory(1);
result = true;
} else if (keyCode == GLFW.GLFW_KEY_ENTER || keyCode == GLFW.GLFW_KEY_KP_ENTER) {
saveHistory();
if (canLoseFocus) {
setFocused(false);
}
result = true;
} else if (keyCode == GLFW.GLFW_KEY_ESCAPE) {
saveHistory();
if (!canLoseFocus) {
// If we can't lose focus,
// and we press escape,
// we unfocus ourselves,
// and close the screen immediately.
setFocused(false);
result = false; // Bubble the event up to the screen.
return false; // Bubble the event up to the screen.
} else {
// If we can lose focus,
// and we press escape,
// we unfocus ourselves.
// On the next escape press, the screen will close.
setFocused(false);
result = true;
return true; // Swallow
}
}
}
if (BaseScreen.isKeyDown(RSKeyBindings.FOCUS_SEARCH_BAR) && canLoseFocus) {
setFocused(!isFocused());
saveHistory();
result = true;
return true;
}
return result;
return isFocused() && canConsumeInput() && keyCode != GLFW.GLFW_KEY_ESCAPE;
}
private void updateHistory(int delta) {