mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-05 21:11:35 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fix intended Longpress-to-move on Android not working (#9962)

Browse Source
This commit is contained in:
SomeTroglodyte 2023-08-24 09:08:36 +02:00 committed by GitHub
parent 2ce258b281
commit cfd22621ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/com/unciv/ui/components/input/ActivationExtensions.kt
View File

@ -98,14 +98,13 @@ fun Actor.onRightClick(sound: UncivSound = UncivSound.Click, action: ActivationA
* A [sound] will be played (concurrently) on activation unless you specify [UncivSound.Silent].
* @return `this` to allow chaining
*/
@Suppress("unused") // Just in case - for now, only onRightClick is used
@Suppress("unused") // Just in case - for now, the Longpress in WorldMapHolder is using onActivation directly
fun Actor.onLongPress(sound: UncivSound = UncivSound.Click, action: ActivationAction): Actor =
onActivation(ActivationTypes.Longpress, sound, noEquivalence = true, action)
/** Clears activation actions for a specific [type], and, if [noEquivalence] is `true`,
* its [equivalent][ActivationTypes.isEquivalent] types.
*/
@Suppress("unused") // Just in case - for now, it's automatic clear via clearListener
fun Actor.clearActivationActions(type: ActivationTypes, noEquivalence: Boolean = true) {
ActorAttachments.get(this).clearActivationActions(type, noEquivalence)
}

22
core/src/com/unciv/ui/screens/worldscreen/WorldMapHolder.kt
View File

@ -39,11 +39,11 @@ import com.unciv.ui.components.extensions.colorFromRGB
import com.unciv.ui.components.extensions.darken
import com.unciv.ui.components.extensions.surroundWithCircle
import com.unciv.ui.components.extensions.toLabel
import com.unciv.ui.components.input.ActivationTypes
import com.unciv.ui.components.input.KeyCharAndCode
import com.unciv.ui.components.input.keyShortcuts
import com.unciv.ui.components.input.onActivation
import com.unciv.ui.components.input.onClick
import com.unciv.ui.components.input.onRightClick
import com.unciv.ui.components.tilegroups.TileGroup
import com.unciv.ui.components.tilegroups.TileGroupMap
import com.unciv.ui.components.tilegroups.TileSetStrings
@ -124,14 +124,15 @@ class WorldMapHolder(
}
tileGroup.onClick { onTileClicked(tileGroup.tile) }
// On 'droid two-finger tap is mapped to right click and dissent has been expressed
if (Gdx.app.type == Application.ApplicationType.Android)
continue
// Right mouse click listener
tileGroup.onRightClick {
// Right mouse click on desktop / Longpress on Android, and no equivalence mapping between those two,
// because on 'droid two-finger tap is mapped to right click and dissent has been expressed
tileGroup.onActivation(
type = if (Gdx.app.type == Application.ApplicationType.Android)
ActivationTypes.Longpress else ActivationTypes.RightClick,
noEquivalence = true
) {
val unit = worldScreen.bottomUnitTable.selectedUnit
?: return@onRightClick
?: return@onActivation
Concurrency.run("WorldScreenClick") {
onTileRightClicked(unit, tileGroup.tile)
}
@ -695,7 +696,7 @@ class WorldMapHolder(
if (nukeBlastRadius >= 0)
selectedTile!!.getTilesInDistance(nukeBlastRadius)
// Should not display invisible submarine units even if the tile is visible.
.filter { targetTile -> (targetTile.isVisible(unit.civ) && targetTile.getUnits().any { !it.isInvisible(unit.civ) })
.filter { targetTile -> (targetTile.isVisible(unit.civ) && targetTile.getUnits().any { !it.isInvisible(unit.civ) })
|| (targetTile.isCityCenter() && unit.civ.hasExplored(targetTile)) }
.map { AttackableTile(unit.getTile(), it, 1f, null) }
.toList()
@ -798,8 +799,7 @@ class WorldMapHolder(
unitActionOverlays.clear()
}
override fun reloadMaxZoom()
{
override fun reloadMaxZoom() {
val maxWorldZoomOut = UncivGame.Current.settings.maxWorldZoomOut
val mapRadius = tileMap.mapParameters.mapSize.radius