AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-24 03:53:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Scroll panes get scrollfocus automatically (#2358)

Browse Source 
* Bring Incas into the main game
(also changes slinger withdraw ability to inheritable)

* Update Nations.json

* ScrollPanes steal and release focus automatically

* ScrollPanes steal and release focus automatically: Commented & param names
This commit is contained in:
proteus-anguinus 2020-04-08 15:30:10 +02:00 committed by GitHub
parent 9f46ceea24
commit d15abd66b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
25 changed files with 76 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/com/unciv/ui/CivilopediaScreen.kt
View File

@ -1,5 +1,6 @@
package com.unciv.ui
import com.unciv.ui.utils.AutoScrollPane as ScrollPane
import com.badlogic.gdx.scenes.scene2d.Actor
import com.badlogic.gdx.scenes.scene2d.ui.*
import com.unciv.UncivGame

1
core/src/com/unciv/ui/EmpireOverviewScreen.kt
View File

@ -1,5 +1,6 @@
package com.unciv.ui
import com.unciv.ui.utils.AutoScrollPane as ScrollPane
import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.scenes.scene2d.Actor
import com.badlogic.gdx.scenes.scene2d.Group

1
core/src/com/unciv/ui/MultiplayerScreen.kt
View File

@ -1,5 +1,6 @@
package com.unciv.ui
import com.unciv.ui.utils.AutoScrollPane as ScrollPane
import com.badlogic.gdx.Gdx
import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.scenes.scene2d.ui.*

2
core/src/com/unciv/ui/cityscreen/CityInfoTable.kt
View File

@ -1,8 +1,8 @@
package com.unciv.ui.cityscreen
import com.unciv.ui.utils.AutoScrollPane as ScrollPane
import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.scenes.scene2d.Touchable
import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane
import com.badlogic.gdx.scenes.scene2d.ui.Table
import com.badlogic.gdx.scenes.scene2d.ui.TextButton
import com.badlogic.gdx.utils.Align

2
core/src/com/unciv/ui/cityscreen/CityScreen.kt
View File

@ -1,7 +1,7 @@
package com.unciv.ui.cityscreen
import com.unciv.ui.utils.AutoScrollPane as ScrollPane
import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane
import com.badlogic.gdx.scenes.scene2d.ui.Table
import com.badlogic.gdx.scenes.scene2d.ui.TextButton
import com.badlogic.gdx.utils.Align

2
core/src/com/unciv/ui/cityscreen/ConstructionInfoTable.kt
View File

@ -1,8 +1,8 @@
package com.unciv.ui.cityscreen
import com.unciv.ui.utils.AutoScrollPane as ScrollPane
import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.scenes.scene2d.ui.Table
import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane
import com.unciv.logic.city.CityInfo
import com.unciv.logic.city.IConstruction
import com.unciv.logic.city.PerpetualConstruction

3
core/src/com/unciv/ui/cityscreen/ConstructionsTable.kt
View File

@ -1,8 +1,8 @@
package com.unciv.ui.cityscreen
import com.unciv.ui.utils.AutoScrollPane as ScrollPane
import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.scenes.scene2d.Touchable
import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane
import com.badlogic.gdx.scenes.scene2d.ui.Table
import com.badlogic.gdx.scenes.scene2d.ui.TextButton
import com.badlogic.gdx.utils.Align
@ -11,7 +11,6 @@ import com.unciv.logic.city.CityInfo
import com.unciv.logic.city.IConstruction
import com.unciv.logic.city.PerpetualConstruction
import com.unciv.models.UncivSound
import com.unciv.models.ruleset.Building
import com.unciv.models.stats.Stat
import com.unciv.models.translations.tr
import com.unciv.ui.cityscreen.ConstructionInfoTable.Companion.turnOrTurns

2
core/src/com/unciv/ui/mapeditor/LoadMapScreen.kt
View File

@ -1,8 +1,8 @@
package com.unciv.ui.mapeditor
import com.unciv.ui.utils.AutoScrollPane as ScrollPane
import com.badlogic.gdx.Gdx
import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane
import com.badlogic.gdx.scenes.scene2d.ui.Table
import com.badlogic.gdx.scenes.scene2d.ui.TextButton
import com.unciv.UncivGame

1
core/src/com/unciv/ui/mapeditor/MapDownloadPopup.kt
View File

@ -1,5 +1,6 @@
package com.unciv.ui.mapeditor
import com.unciv.ui.utils.AutoScrollPane as ScrollPane
import com.badlogic.gdx.Gdx
import com.badlogic.gdx.scenes.scene2d.ui.*
import com.badlogic.gdx.utils.Align

1
core/src/com/unciv/ui/mapeditor/MapEditorScreen.kt
View File

@ -55,6 +55,7 @@ class MapEditorScreen(): CameraStageBaseScreen() {
mapHolder = EditorMapHolder(this, tileMap)
mapHolder.addTiles()
stage.addActor(mapHolder)
stage.scrollFocus = mapHolder
stage.addActor(tileEditorOptions)
tileEditorOptions.setPosition(stage.width - tileEditorOptions.width, 0f)

2
core/src/com/unciv/ui/mapeditor/NewMapScreen.kt
View File

@ -1,7 +1,7 @@
package com.unciv.ui.mapeditor
import com.unciv.ui.utils.AutoScrollPane as ScrollPane
import com.badlogic.gdx.Gdx
import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane
import com.badlogic.gdx.scenes.scene2d.ui.Table
import com.unciv.UncivGame
import com.unciv.logic.map.MapGenerator

2
core/src/com/unciv/ui/mapeditor/TileEditorOptionsTable.kt
View File

@ -1,9 +1,9 @@
package com.unciv.ui.mapeditor
import com.unciv.ui.utils.AutoScrollPane as ScrollPane
import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.scenes.scene2d.Actor
import com.badlogic.gdx.scenes.scene2d.Group
import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane
import com.badlogic.gdx.scenes.scene2d.ui.Slider
import com.badlogic.gdx.scenes.scene2d.ui.Table
import com.badlogic.gdx.scenes.scene2d.ui.TextButton

2
core/src/com/unciv/ui/newgamescreen/NewGameScreen.kt
View File

@ -1,7 +1,7 @@
package com.unciv.ui.newgamescreen
import com.unciv.ui.utils.AutoScrollPane as ScrollPane
import com.badlogic.gdx.Gdx
import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane
import com.badlogic.gdx.scenes.scene2d.ui.SelectBox
import com.badlogic.gdx.scenes.scene2d.ui.Skin
import com.badlogic.gdx.utils.Array

2
core/src/com/unciv/ui/newgamescreen/PlayerPickerTable.kt
View File

@ -1,9 +1,9 @@
package com.unciv.ui.newgamescreen
import com.unciv.ui.utils.AutoScrollPane as ScrollPane
import com.badlogic.gdx.Gdx
import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.scenes.scene2d.Touchable
import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane
import com.badlogic.gdx.scenes.scene2d.ui.Table
import com.badlogic.gdx.scenes.scene2d.ui.TextButton
import com.badlogic.gdx.scenes.scene2d.ui.TextField

1
core/src/com/unciv/ui/pickerscreens/PickerScreen.kt
View File

@ -1,5 +1,6 @@
package com.unciv.ui.pickerscreens
import com.unciv.ui.utils.AutoScrollPane as ScrollPane
import com.badlogic.gdx.scenes.scene2d.ui.*
import com.unciv.UncivGame
import com.unciv.models.translations.tr

4
core/src/com/unciv/ui/saves/LoadGameScreen.kt
View File

@ -1,13 +1,11 @@
package com.unciv.ui.saves
import com.unciv.ui.utils.AutoScrollPane as ScrollPane
import com.badlogic.gdx.Gdx
import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.scenes.scene2d.Actor
import com.badlogic.gdx.scenes.scene2d.ui.CheckBox
import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane
import com.badlogic.gdx.scenes.scene2d.ui.Table
import com.badlogic.gdx.scenes.scene2d.ui.TextButton
import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener
import com.unciv.UncivGame
import com.unciv.logic.GameSaver
import com.unciv.logic.UncivShowableException

1
core/src/com/unciv/ui/saves/SaveGameScreen.kt
View File

@ -1,5 +1,6 @@
package com.unciv.ui.saves
import com.unciv.ui.utils.AutoScrollPane as ScrollPane
import com.badlogic.gdx.Gdx
import com.badlogic.gdx.scenes.scene2d.Actor
import com.badlogic.gdx.scenes.scene2d.ui.*

2
core/src/com/unciv/ui/trade/DiplomacyScreen.kt
View File

@ -1,7 +1,7 @@
package com.unciv.ui.trade
import com.unciv.ui.utils.AutoScrollPane as ScrollPane
import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane
import com.badlogic.gdx.scenes.scene2d.ui.SplitPane
import com.badlogic.gdx.scenes.scene2d.ui.Table
import com.badlogic.gdx.scenes.scene2d.ui.TextButton

2
core/src/com/unciv/ui/trade/OffersListScroll.kt
View File

@ -1,6 +1,6 @@
package com.unciv.ui.trade
import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane
import com.unciv.ui.utils.AutoScrollPane as ScrollPane
import com.badlogic.gdx.scenes.scene2d.ui.Table
import com.badlogic.gdx.scenes.scene2d.ui.TextButton
import com.unciv.Constants

52
core/src/com/unciv/ui/utils/AutoScrollPane.kt Normal file
View File

@ -0,0 +1,52 @@
package com.unciv.ui.utils
import com.badlogic.gdx.scenes.scene2d.Actor
import com.badlogic.gdx.scenes.scene2d.InputEvent
import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane
import com.badlogic.gdx.scenes.scene2d.ui.Skin
import com.badlogic.gdx.scenes.scene2d.utils.ClickListener
/*
** Problem **
Standard LibGdx ScrollPane widgets support vertical scrolling by a mouse wheel.
That works once they have 'Scroll focus' (there's keyboard focus, too) - e.g. once they
are dragged ot clicked once. However, the user expects the mouse wheel to affect
a scrollable widget as soon as the mouse points to it.
** Approach **
Listen to enter and exit events and set focus as needed.
The old focus is saved on eneter and restored on exit to make this as side-effect free as possible.
** Implementation **
The listener is attached per widget (and not, say, to an upper container or the screen, where
one listener would suffice but we'd have to do coordinate to target resolution outselves).
This is accomplished by subclassing the ScrollPane and replacing usages,
which in turn can be done either by using this class as drop-in replacement per widget
or by importing this using an import alias per file.
** Notes **
This should not be used in cases where the mouse wheel should do something else,
e.g. zooming. For panes scrolling only horizontally, using this class is redundant.
To make the signature identical, including parameter names, all constructors have
been replicated functionally by checking the Gdx sources for which defaults to use.
*/
open class AutoScrollPane(widget: Actor?, style: ScrollPaneStyle = ScrollPaneStyle()): ScrollPane(widget,style) {
constructor(widget: Actor, skin: Skin) : this(widget,skin.get(ScrollPaneStyle::class.java))
constructor(widget: Actor, skin: Skin, styleName: String) : this(widget,skin.get(styleName,ScrollPaneStyle::class.java))
private var savedFocus: Actor? = null
init {
this.addListener (object : ClickListener() {
override fun enter(event: InputEvent?, x: Float, y: Float, pointer: Int, fromActor: Actor?) {
if (savedFocus == null) savedFocus = stage.scrollFocus
stage.scrollFocus = this@AutoScrollPane
}
override fun exit(event: InputEvent?, x: Float, y: Float, pointer: Int, toActor: Actor?) {
if (stage.scrollFocus == this@AutoScrollPane) stage.scrollFocus = savedFocus
savedFocus = null
}
})
}
}

3
core/src/com/unciv/ui/worldscreen/Minimap.kt
View File

@ -1,11 +1,11 @@
package com.unciv.ui.worldscreen
import com.unciv.ui.utils.AutoScrollPane as ScrollPane
import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.scenes.scene2d.Event
import com.badlogic.gdx.scenes.scene2d.Group
import com.badlogic.gdx.scenes.scene2d.InputListener
import com.badlogic.gdx.scenes.scene2d.ui.Image
import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane
import com.badlogic.gdx.scenes.scene2d.ui.Table
import com.badlogic.gdx.utils.Align
import com.unciv.UncivGame
@ -13,7 +13,6 @@ import com.unciv.logic.HexMath
import com.unciv.logic.civilization.CivilizationInfo
import com.unciv.logic.map.TileInfo
import com.unciv.ui.utils.ImageGetter
import com.unciv.ui.utils.center
import com.unciv.ui.utils.onClick
import com.unciv.ui.utils.surroundWithCircle
import kotlin.math.max

2
core/src/com/unciv/ui/worldscreen/NotificationsScroll.kt
View File

@ -1,8 +1,8 @@
package com.unciv.ui.worldscreen
import com.unciv.ui.utils.AutoScrollPane as ScrollPane
import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.scenes.scene2d.Touchable
import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane
import com.badlogic.gdx.scenes.scene2d.ui.Table
import com.unciv.logic.civilization.Notification
import com.unciv.ui.utils.ImageGetter

2
core/src/com/unciv/ui/worldscreen/TradePopup.kt
View File

@ -1,7 +1,7 @@
package com.unciv.ui.worldscreen
import com.unciv.ui.utils.AutoScrollPane as ScrollPane
import com.badlogic.gdx.graphics.Color
import com.badlogic.gdx.scenes.scene2d.ui.ScrollPane
import com.badlogic.gdx.scenes.scene2d.ui.Table
import com.unciv.Constants
import com.unciv.logic.civilization.diplomacy.DiplomacyFlags

1
core/src/com/unciv/ui/worldscreen/WorldScreen.kt
View File

@ -91,6 +91,7 @@ class WorldScreen(val viewingCiv:CivilizationInfo) : CameraStageBaseScreen() {
}
stage.addActor(mapHolder)
stage.scrollFocus = mapHolder
stage.addActor(minimapWrapper)
stage.addActor(topBar)
stage.addActor(nextTurnButton)

1
core/src/com/unciv/ui/worldscreen/mainmenu/WorldScreenOptionsPopup.kt
View File

@ -1,5 +1,6 @@
package com.unciv.ui.worldscreen.mainmenu
import com.unciv.ui.utils.AutoScrollPane as ScrollPane
import com.badlogic.gdx.Application
import com.badlogic.gdx.Gdx
import com.badlogic.gdx.graphics.Color