X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=core%2Fsrc%2Fru%2Fdeadsoftware%2Fcavedroid%2Fgame%2Finput%2Fhandler%2Fmouse%2FHotbarMouseInputHandler.kt;h=92f6a5a1a8ed4368393809cad2999a9688162363;hb=6b49d51c59f6d639d949d1e9c264f7f144a305ab;hp=0725abee6fc190dbbc230a82d1e7f1407790abc4;hpb=13157246344c2b94d24354040f0f2d2fb5beb7ea;p=cavedroid.git diff --git a/core/src/ru/deadsoftware/cavedroid/game/input/handler/mouse/HotbarMouseInputHandler.kt b/core/src/ru/deadsoftware/cavedroid/game/input/handler/mouse/HotbarMouseInputHandler.kt index 0725abe..92f6a5a 100644 --- a/core/src/ru/deadsoftware/cavedroid/game/input/handler/mouse/HotbarMouseInputHandler.kt +++ b/core/src/ru/deadsoftware/cavedroid/game/input/handler/mouse/HotbarMouseInputHandler.kt @@ -25,7 +25,7 @@ class HotbarMouseInputHandler @Inject constructor( override fun checkConditions(action: MouseInputAction): Boolean { return buttonHoldTask?.isScheduled == true || - ((action.actionKey is MouseInputActionKey.Left || action.actionKey is MouseInputActionKey.Touch) + ((action.actionKey is MouseInputActionKey.Left || action.actionKey is MouseInputActionKey.Screen) && isInsideHotbar(action) || action.actionKey is MouseInputActionKey.Scroll) && gameWindowsManager.getCurrentWindow() == GameUiWindow.NONE @@ -75,7 +75,7 @@ class HotbarMouseInputHandler @Inject constructor( cancelHold() } - if (action.actionKey !is MouseInputActionKey.Left && action.actionKey !is MouseInputActionKey.Touch ) { + if (action.actionKey !is MouseInputActionKey.Left && action.actionKey !is MouseInputActionKey.Screen ) { if (action.actionKey is MouseInputActionKey.Scroll) { handleScroll(action) }