studiorailgun/Renderer
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tooltip fix
All checks were successful
studiorailgun/Renderer/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
austin 2025-03-27 19:47:53 -04:00
parent 72915798b3
commit aec3733429
5 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/src/progress/renderertodo.md
View File

@ -1346,6 +1346,8 @@ Block meshgen work
Delete deprecated foliage manager
Title menu navigation work
Fix UI Testing debug menu
Fix orphan tooltips from inventory screen
Code formatting
# TODO

6
src/main/java/electrosphere/client/ui/components/SpawnSelectionPanel.java
View File

@ -68,7 +68,7 @@ public class SpawnSelectionPanel {
searchInput.setMarginTop(SEARCH_INPUT_MARGIN);
searchInput.setOnPress(new KeyboardEventCallback() {public boolean execute(KeyboardEvent event){
boolean rVal = searchInput.defaultKeyHandling(event);
fillInEntitySelectors(scrollable, searchInput.getText(), onSelectType);
SpawnSelectionPanel.fillInEntitySelectors(scrollable, searchInput.getText(), onSelectType);
return rVal;
}});
rVal.addChild(searchInput);
@ -78,7 +78,7 @@ public class SpawnSelectionPanel {
rVal.addChild(scrollable);
//final step
fillInEntitySelectors(scrollable, searchInput.getText(), onSelectType);
SpawnSelectionPanel.fillInEntitySelectors(scrollable, searchInput.getText(), onSelectType);
return rVal;
}
@ -97,7 +97,7 @@ public class SpawnSelectionPanel {
types.addAll(Globals.gameConfigCurrent.getFoliageMap().getFoliageList());
types.addAll(Globals.gameConfigCurrent.getItemMap().getTypes());
types.addAll(Globals.gameConfigCurrent.getObjectTypeMap().getTypes());
types = types.stream().filter((type)->type.getId().toLowerCase().contains(searchString.toLowerCase())).toList();
types = types.stream().filter((type) -> type.getId().toLowerCase().contains(searchString.toLowerCase())).toList();
//generate ui elements
for(CommonEntityType type : types){

13
src/main/java/electrosphere/client/ui/menu/WindowUtils.java
View File

@ -171,6 +171,19 @@ public class WindowUtils {
Globals.elementService.unregisterWindow(window);
}
/**
* Tries to clear all tooltips
*/
public static void clearTooltips(){
Globals.signalSystem.post(SignalType.UI_MODIFICATION,()->{
Window tooltipWindow = (Window)Globals.elementService.getWindow(WindowStrings.TOOLTIP_WINDOW);
for(Element child : tooltipWindow.getChildren()){
Globals.signalSystem.post(SignalType.YOGA_DESTROY, child);
}
tooltipWindow.clearChildren();
});
}
/**

2
src/main/java/electrosphere/controls/categories/ControlCategoryInventory.java
View File

@ -20,7 +20,6 @@ import electrosphere.renderer.ui.events.MouseEvent;
public class ControlCategoryInventory {
//inventory
public static final String INPUT_CODE_INVENTORY_CLOSE = "inventoryClose";
public static final String INPUT_CODE_INVENTORY_ITEM_MANIPULATE = "inventoryItemManipulate";
public static final String INPUT_CODE_INVENTORY_ITEM_DRAG = "inventoryDrag";
@ -29,7 +28,6 @@ public class ControlCategoryInventory {
* @param handler
*/
public static void mapControls(ControlHandler handler){
handler.addControl(INPUT_CODE_INVENTORY_CLOSE, new Control(ControlType.KEY,GLFW.GLFW_KEY_I,false,"",""));
handler.addControl(INPUT_CODE_INVENTORY_ITEM_MANIPULATE, new Control(ControlType.MOUSE_BUTTON,GLFW.GLFW_MOUSE_BUTTON_1,false,"",""));
handler.addControl(INPUT_CODE_INVENTORY_ITEM_DRAG, new Control(ControlType.MOUSE_MOVEMENT,0,false,"",""));
}

1
src/main/java/electrosphere/controls/categories/ControlCategoryMainGame.java
View File

@ -716,6 +716,7 @@ public class ControlCategoryMainGame {
Globals.openInventoriesCount++;
} else if(InventoryUtils.hasNaturalInventory(Globals.playerEntity) && Globals.elementService.getWindow(WindowStrings.WINDOW_CHARACTER) != null){
Globals.elementService.closeWindow(WindowStrings.WINDOW_CHARACTER);
WindowUtils.clearTooltips();
Globals.renderingEngine.getPostProcessingPipeline().setApplyBlur(false);
if(Globals.virtualAudioSourceManager != null){
Globals.virtualAudioSourceManager.createVirtualAudioSource(AssetDataStrings.UI_SFX_INVENTORY_CLOSE, VirtualAudioSourceType.UI, false);