Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions src/main/java/com/lambda/mixin/render/ScreenMixin.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package com.lambda.mixin.render;

import com.lambda.gui.components.QuickSearch;
import com.lambda.module.modules.client.AutoUpdater;
import com.lambda.module.modules.render.ContainerPreview;
import com.lambda.module.modules.render.NoRender;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
Expand All @@ -37,9 +38,19 @@
public class ScreenMixin {
@Inject(method = "keyPressed", at = @At("HEAD"), cancellable = true)
private void onKeyPressed(KeyInput input, CallbackInfoReturnable<Boolean> cir) {
if (input.key() == GLFW.GLFW_KEY_ESCAPE && QuickSearch.INSTANCE.isOpen()) {
QuickSearch.INSTANCE.close();
cir.setReturnValue(true);
if (input.key() == GLFW.GLFW_KEY_ESCAPE) {
if (QuickSearch.INSTANCE.isOpen()) {
QuickSearch.INSTANCE.close();
cir.setReturnValue(true);
} else if (AutoUpdater.getShowInstallModal()) {
AutoUpdater.INSTANCE.disable();
AutoUpdater.setShowInstallModal(false);
cir.setReturnValue(true);
} else if (AutoUpdater.getShowUninstallModal()) {
AutoUpdater.INSTANCE.enable();
AutoUpdater.setShowUninstallModal(false);
cir.setReturnValue(true);
}
}
}

Expand Down
15 changes: 9 additions & 6 deletions src/main/kotlin/com/lambda/gui/components/QuickSearch.kt
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import com.lambda.gui.dsl.ImGuiBuilder
import com.lambda.module.HudModule
import com.lambda.module.Module
import com.lambda.module.ModuleRegistry
import com.lambda.module.modules.client.AutoUpdater
import com.lambda.util.KeyCode
import com.lambda.util.StringUtils.capitalize
import com.lambda.util.StringUtils.levenshteinDistance
Expand All @@ -54,12 +55,13 @@ object QuickSearch {

private const val DOUBLE_SHIFT_WINDOW_MS = 500L
private const val MAX_RESULTS = 50
private const val WINDOW_FLAGS = ImGuiWindowFlags.AlwaysAutoResize or
ImGuiWindowFlags.NoTitleBar or
ImGuiWindowFlags.NoMove or
ImGuiWindowFlags.NoResize or
ImGuiWindowFlags.NoScrollbar or
ImGuiWindowFlags.NoScrollWithMouse
const val WINDOW_FLAGS =
ImGuiWindowFlags.AlwaysAutoResize or
ImGuiWindowFlags.NoTitleBar or
ImGuiWindowFlags.NoMove or
ImGuiWindowFlags.NoResize or
ImGuiWindowFlags.NoScrollbar or
ImGuiWindowFlags.NoScrollWithMouse

init {
listenUnsafe<ButtonEvent.Keyboard.Press> { event ->
Expand Down Expand Up @@ -303,6 +305,7 @@ object QuickSearch {
}

private fun handleKeyPress(event: ButtonEvent.Keyboard.Press) {
if (AutoUpdater.showInstallModal || AutoUpdater.showUninstallModal) return
if ((!event.isPressed || event.isRepeated) ||
!(event.keyCode == KeyCode.LeftShift.code || event.keyCode == KeyCode.RightShift.code)) return

Expand Down
3 changes: 2 additions & 1 deletion src/main/kotlin/com/lambda/gui/components/SettingsWidget.kt
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import com.lambda.config.configurations.UserAutomationConfigs
import com.lambda.gui.dsl.ImGuiBuilder
import com.lambda.module.HudModule
import com.lambda.module.Module
import com.lambda.module.modules.client.AutoUpdater
import com.lambda.util.NamedEnum
import imgui.ImGui
import imgui.flag.ImGuiPopupFlags
Expand All @@ -37,7 +38,7 @@ object SettingsWidget {
*/
fun ImGuiBuilder.buildConfigSettingsContext(config: Configurable) {
group {
if (config is Module) {
if (config is Module && config !== AutoUpdater) {
with(config.keybindSetting) { buildLayout() }
with(config.disableOnReleaseSetting) { buildLayout() }
with(config.drawSetting) { buildLayout() }
Expand Down
Loading