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

Resolved #8169 - Map editor tabs look scrollable

Browse Source
This commit is contained in:
Yair Morgenstern
2023-03-19 23:08:30 +02:00
parent 7cd6a68639
commit b51374859b
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/com/unciv/ui/components/TabbedPager.kt
View File

@ -16,8 +16,6 @@ import com.badlogic.gdx.scenes.scene2d.utils.ActorGestureListener
import com.badlogic.gdx.utils.Align import com.badlogic.gdx.utils.Align
import com.unciv.Constants import com.unciv.Constants
import com.unciv.UncivGame 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.UncivTooltip.Companion.addTooltip
import com.unciv.ui.components.extensions.addSeparator import com.unciv.ui.components.extensions.addSeparator
import com.unciv.ui.components.extensions.darken 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.onActivation
import com.unciv.ui.components.extensions.packIfNeeded import com.unciv.ui.components.extensions.packIfNeeded
import com.unciv.ui.components.extensions.pad 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 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 //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 set
private val header = Table(BaseScreen.skin) private val header = Table(BaseScreen.skin)
private val headerScroll = LinkedScrollPane(horizontalOnly = true, header) protected val headerScroll = LinkedScrollPane(horizontalOnly = true, header)
protected var headerHeight = 0f protected var headerHeight = 0f
private val fixedContentScroll = LinkedScrollPane(horizontalOnly = true) private val fixedContentScroll = LinkedScrollPane(horizontalOnly = true)
@ -188,7 +188,7 @@ open class TabbedPager(
} }
} }
private class LinkedScrollPane( class LinkedScrollPane(
horizontalOnly: Boolean, horizontalOnly: Boolean,
widget: Actor? = null, widget: Actor? = null,
linkTo: LinkedScrollPane? = null linkTo: LinkedScrollPane? = null

6
core/src/com/unciv/ui/screens/mapeditorscreen/MapEditorMainTabs.kt
View File

@ -1,5 +1,7 @@
package com.unciv.ui.screens.mapeditorscreen 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.images.ImageGetter
import com.unciv.ui.screens.mapeditorscreen.tabs.MapEditorEditTab import com.unciv.ui.screens.mapeditorscreen.tabs.MapEditorEditTab
import com.unciv.ui.screens.mapeditorscreen.tabs.MapEditorGenerateTab 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.MapEditorOptionsTab
import com.unciv.ui.screens.mapeditorscreen.tabs.MapEditorSaveTab import com.unciv.ui.screens.mapeditorscreen.tabs.MapEditorSaveTab
import com.unciv.ui.screens.mapeditorscreen.tabs.MapEditorViewTab import com.unciv.ui.screens.mapeditorscreen.tabs.MapEditorViewTab
import com.unciv.ui.components.KeyCharAndCode
import com.unciv.ui.components.TabbedPager
class MapEditorMainTabs( class MapEditorMainTabs(
editorScreen: MapEditorScreen editorScreen: MapEditorScreen
@ -53,5 +53,7 @@ class MapEditorMainTabs(
ImageGetter.getImage("OtherIcons/Settings"), 25f, ImageGetter.getImage("OtherIcons/Settings"), 25f,
shortcutKey = KeyCharAndCode.ctrl('o')) shortcutKey = KeyCharAndCode.ctrl('o'))
selectPage(0) selectPage(0)
headerScroll.fadeScrollBars = false
} }
} }