diff --git a/core/src/com/unciv/ui/components/TabbedPager.kt b/core/src/com/unciv/ui/components/TabbedPager.kt index 9a107a990b..accffa023b 100644 --- a/core/src/com/unciv/ui/components/TabbedPager.kt +++ b/core/src/com/unciv/ui/components/TabbedPager.kt @@ -16,8 +16,6 @@ import com.badlogic.gdx.scenes.scene2d.utils.ActorGestureListener import com.badlogic.gdx.utils.Align import com.unciv.Constants import com.unciv.UncivGame -import com.unciv.ui.images.IconTextButton -import com.unciv.ui.popups.Popup import com.unciv.ui.components.UncivTooltip.Companion.addTooltip import com.unciv.ui.components.extensions.addSeparator import com.unciv.ui.components.extensions.darken @@ -26,6 +24,8 @@ import com.unciv.ui.components.extensions.keyShortcuts import com.unciv.ui.components.extensions.onActivation import com.unciv.ui.components.extensions.packIfNeeded import com.unciv.ui.components.extensions.pad +import com.unciv.ui.images.IconTextButton +import com.unciv.ui.popups.Popup import com.unciv.ui.screens.basescreen.BaseScreen //TODO If keys are assigned, the widget is in a popup not filling stage width, and a button is @@ -80,7 +80,7 @@ open class TabbedPager( private set private val header = Table(BaseScreen.skin) - private val headerScroll = LinkedScrollPane(horizontalOnly = true, header) + protected val headerScroll = LinkedScrollPane(horizontalOnly = true, header) protected var headerHeight = 0f private val fixedContentScroll = LinkedScrollPane(horizontalOnly = true) @@ -188,7 +188,7 @@ open class TabbedPager( } } - private class LinkedScrollPane( + class LinkedScrollPane( horizontalOnly: Boolean, widget: Actor? = null, linkTo: LinkedScrollPane? = null diff --git a/core/src/com/unciv/ui/screens/mapeditorscreen/MapEditorMainTabs.kt b/core/src/com/unciv/ui/screens/mapeditorscreen/MapEditorMainTabs.kt index d4ff2f3a87..81417a19bc 100644 --- a/core/src/com/unciv/ui/screens/mapeditorscreen/MapEditorMainTabs.kt +++ b/core/src/com/unciv/ui/screens/mapeditorscreen/MapEditorMainTabs.kt @@ -1,5 +1,7 @@ package com.unciv.ui.screens.mapeditorscreen +import com.unciv.ui.components.KeyCharAndCode +import com.unciv.ui.components.TabbedPager import com.unciv.ui.images.ImageGetter import com.unciv.ui.screens.mapeditorscreen.tabs.MapEditorEditTab import com.unciv.ui.screens.mapeditorscreen.tabs.MapEditorGenerateTab @@ -8,8 +10,6 @@ import com.unciv.ui.screens.mapeditorscreen.tabs.MapEditorModsTab import com.unciv.ui.screens.mapeditorscreen.tabs.MapEditorOptionsTab import com.unciv.ui.screens.mapeditorscreen.tabs.MapEditorSaveTab import com.unciv.ui.screens.mapeditorscreen.tabs.MapEditorViewTab -import com.unciv.ui.components.KeyCharAndCode -import com.unciv.ui.components.TabbedPager class MapEditorMainTabs( editorScreen: MapEditorScreen @@ -53,5 +53,7 @@ class MapEditorMainTabs( ImageGetter.getImage("OtherIcons/Settings"), 25f, shortcutKey = KeyCharAndCode.ctrl('o')) selectPage(0) + + headerScroll.fadeScrollBars = false } }