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

Add a setting to forbid closing popups by clicking behind them (#10539)

Browse Source 
* Add a setting to forbit closing popups by clicking behind them

* Change default checkbox state to false

* Update template and Russian translation
This commit is contained in:
Sergey 2023-11-23 02:59:07 +05:00 committed by GitHub
parent 8bd2363361
commit 30c4b323ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
android/assets/jsons/translations/Russian.properties
View File

@ -746,6 +746,7 @@ Reset = Сбросить
Show zoom buttons in world screen = Показывать кнопки масштабирования на экране мира Show zoom buttons in world screen = Показывать кнопки масштабирования на экране мира
Experimental Demographics scoreboard = Экспериментальная таблица рейтинга Experimental Demographics scoreboard = Экспериментальная таблица рейтинга
Never close popups by clicking outside = Не закрывать всплывающие окна нажатием на их фон
Size of Unitset art in Civilopedia = Размер изображений палитры юнитов в Цивилопедии Size of Unitset art in Civilopedia = Размер изображений палитры юнитов в Цивилопедии

1
android/assets/jsons/translations/template.properties
View File

@ -746,6 +746,7 @@ Reset =
Show zoom buttons in world screen = Show zoom buttons in world screen =
Experimental Demographics scoreboard = Experimental Demographics scoreboard =
Never close popups by clicking outside =
Size of Unitset art in Civilopedia = Size of Unitset art in Civilopedia =

1
core/src/com/unciv/models/metadata/GameSettings.kt
View File

@ -81,6 +81,7 @@ class GameSettings {
var visualMods = HashSet<String>() var visualMods = HashSet<String>()
var useDemographics: Boolean = false var useDemographics: Boolean = false
var showZoomButtons: Boolean = false var showZoomButtons: Boolean = false
var forbidPopupClickBehindToClose: Boolean = false
var notificationsLogMaxTurns = 5 var notificationsLogMaxTurns = 5

3
core/src/com/unciv/ui/popups/Popup.kt
View File

@ -18,6 +18,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.WidgetGroup
import com.badlogic.gdx.scenes.scene2d.utils.ClickListener import com.badlogic.gdx.scenes.scene2d.utils.ClickListener
import com.badlogic.gdx.utils.Align import com.badlogic.gdx.utils.Align
import com.unciv.Constants import com.unciv.Constants
import com.unciv.GUI
import com.unciv.logic.event.EventBus import com.unciv.logic.event.EventBus
import com.unciv.ui.components.widgets.AutoScrollPane import com.unciv.ui.components.widgets.AutoScrollPane
import com.unciv.ui.components.extensions.addSeparator import com.unciv.ui.components.extensions.addSeparator
@ -227,7 +228,7 @@ open class Popup(
/** Allow closing a popup by clicking 'outside', Android-style, but only if a Close button exists */ /** Allow closing a popup by clicking 'outside', Android-style, but only if a Close button exists */
private fun getBehindClickListener() = object : ClickListener() { private fun getBehindClickListener() = object : ClickListener() {
override fun clicked(event: InputEvent?, x: Float, y: Float) { override fun clicked(event: InputEvent?, x: Float, y: Float) {
if (!clickBehindToClose) return if (!clickBehindToClose || GUI.getSettings().forbidPopupClickBehindToClose) return
// Since Gdx doesn't limit events to the actually `hit` actors... // Since Gdx doesn't limit events to the actually `hit` actors...
if (event?.target != this@Popup) return if (event?.target != this@Popup) return
close() close()

1
core/src/com/unciv/ui/popups/options/DisplayTab.kt
View File

@ -71,6 +71,7 @@ fun displayTab(
addResetTutorials(this, settings) addResetTutorials(this, settings)
optionsPopup.addCheckbox(this, "Show zoom buttons in world screen", settings.showZoomButtons, true) { settings.showZoomButtons = it } optionsPopup.addCheckbox(this, "Show zoom buttons in world screen", settings.showZoomButtons, true) { settings.showZoomButtons = it }
optionsPopup.addCheckbox(this, "Experimental Demographics scoreboard", settings.useDemographics, true) { settings.useDemographics = it } optionsPopup.addCheckbox(this, "Experimental Demographics scoreboard", settings.useDemographics, true) { settings.useDemographics = it }
optionsPopup.addCheckbox(this, "Never close popups by clicking outside", settings.forbidPopupClickBehindToClose, false) { settings.forbidPopupClickBehindToClose = it }
addPediaUnitArtSizeSlider(this, settings, optionsPopup.selectBoxMinWidth) addPediaUnitArtSizeSlider(this, settings, optionsPopup.selectBoxMinWidth)
addSeparator() addSeparator()