From b4f588e70f012d492edb8ad61c62897acd392c29 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Fri, 21 May 2021 13:41:58 +0300
Subject: [PATCH] Minimap slider has better values to accommodate screen sizes

---
 core/src/com/unciv/ui/worldscreen/Minimap.kt      |  2 +-
 .../unciv/ui/worldscreen/mainmenu/OptionsPopup.kt | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/core/src/com/unciv/ui/worldscreen/Minimap.kt b/core/src/com/unciv/ui/worldscreen/Minimap.kt
index 166c49e7ca..27b76af1b7 100644
--- a/core/src/com/unciv/ui/worldscreen/Minimap.kt
+++ b/core/src/com/unciv/ui/worldscreen/Minimap.kt
@@ -49,7 +49,7 @@ class Minimap(val mapHolder: WorldMapHolder, minimapSize: Int) : Table(){
             if (shape != MapShape.rectangular) mapSize.radius
             else max (mapSize.height, mapSize.width * 3 / 4) * MapSize.Huge.radius / MapSize.Huge.height
         }
-        val groupSize = (minimapSize + 1) * 100f / effectiveRadius
+        val groupSize = (minimapSize + 1) * 10f / effectiveRadius
 
         for (tileInfo in mapHolder.tileMap.values) {
             val hex = ImageGetter.getImage("OtherIcons/Hexagon")
diff --git a/core/src/com/unciv/ui/worldscreen/mainmenu/OptionsPopup.kt b/core/src/com/unciv/ui/worldscreen/mainmenu/OptionsPopup.kt
index c3d531a276..d53406709b 100644
--- a/core/src/com/unciv/ui/worldscreen/mainmenu/OptionsPopup.kt
+++ b/core/src/com/unciv/ui/worldscreen/mainmenu/OptionsPopup.kt
@@ -4,7 +4,6 @@ import com.badlogic.gdx.Application
 import com.badlogic.gdx.Gdx
 import com.badlogic.gdx.graphics.Color
 import com.badlogic.gdx.scenes.scene2d.ui.*
-import com.badlogic.gdx.utils.Array as GdxArray
 import com.unciv.MainMenuScreen
 import com.unciv.logic.civilization.PlayerType
 import com.unciv.models.UncivSound
@@ -17,6 +16,7 @@ import com.unciv.ui.worldscreen.WorldScreen
 import java.util.*
 import kotlin.concurrent.thread
 import kotlin.math.min
+import com.badlogic.gdx.utils.Array as GdxArray
 import com.unciv.ui.utils.AutoScrollPane as ScrollPane
 
 class Language(val language:String, val percentComplete:Int){
@@ -168,14 +168,15 @@ class OptionsPopup(val previousScreen:CameraStageBaseScreen) : Popup(previousScr
     private fun addMinimapSizeSlider() {
         optionsTable.add("Show minimap".tr())
 
-        val minimapSliderLimit = resolutionArray.indexOf(settings.resolution) + 1
-        val minimapSlider = Slider(0f, minimapSliderLimit.toFloat(), 1f, false, skin)
-        minimapSlider.value = if(settings.showMinimap) min(settings.minimapSize, minimapSliderLimit).toFloat() else 0f
+        val minimapSliderLimit = (resolutionArray.indexOf(settings.resolution) + 1) *5f
+        // each 1 point is effectively 10px per hexagon
+        val minimapSlider = Slider(0f, minimapSliderLimit, 1f, false, skin)
+        minimapSlider.value = if(settings.showMinimap) min(settings.minimapSize.toFloat(), minimapSliderLimit)
+        else 0f
         minimapSlider.onChange {
             val size = minimapSlider.value.toInt()
-            if (size == 0) {
-                settings.showMinimap = false
-            } else {
+            if (size == 0) settings.showMinimap = false
+            else {
                 settings.showMinimap = true
                 settings.minimapSize = size
             }