Skip to content

Feature/71 improve map preview #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DivineThreepwood merged 5 commits into from
Jun 16, 2026
Merged

Feature/71 improve map preview #72

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3ec9b40
implement map preview
DivineThreepwood Jun 13, 2026
6682c9d
fix formatting
DivineThreepwood Jun 13, 2026
5411293
Merge dev into feature/71-improve-map-preview
github-actions[bot] Jun 16, 2026
570694f
Merge dev into feature/71-improve-map-preview
github-actions[bot] Jun 16, 2026
f66c84b
Apply suggestions from code review
DivineThreepwood Jun 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
74 changes: 56 additions & 18 deletions src/main/kotlin/org/openbase/planetsudo/view/configuration/ConfigurationPanel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ import java.util.*
import javax.swing.*
import javax.swing.border.BevelBorder
import javax.swing.border.SoftBevelBorder
import javax.swing.event.ListSelectionEvent
import javax.swing.event.PopupMenuEvent
import javax.swing.event.PopupMenuListener
import javax.swing.plaf.basic.ComboPopup
import kotlin.random.Random

/**
Expand All @@ -54,8 +58,9 @@ class ConfigurationPanel : JPanel() {
levelChooserComboBox!!.addItem(levelName)
}
if (levelChooserComboBox!!.itemCount >= 0) {
val index = stateProperties.getProperty(PROPERTY_SELECTED_LEVEL, "0").toInt()
levelChooserComboBox!!.selectedIndex = if (index < levelChooserComboBox!!.itemCount) index else 0
stateProperties.getProperty(PROPERTY_SELECTED_LEVEL, "0").toIntOrNull()?.let { index ->
levelChooserComboBox!!.selectedIndex = if (index < levelChooserComboBox!!.itemCount) index else 0
}
}
levelChooserComboBox!!.isEnabled = true
randomLevelButton!!.isEnabled = true
Expand Down Expand Up @@ -347,6 +352,33 @@ class ConfigurationPanel : JPanel() {
levelChooserComboBox!!.setMaximumRowCount(20)
levelChooserComboBox!!.setModel(DefaultComboBoxModel())
levelChooserComboBox!!.addActionListener { _ -> levelChooserComboBoxActionPerformed() }
levelChooserComboBox!!.addPopupMenuListener(
object : PopupMenuListener {
override fun popupMenuWillBecomeVisible(e: PopupMenuEvent?) {
val child: Any? = levelChooserComboBox!!.getAccessibleContext().getAccessibleChild(0)

if (child is ComboPopup) {
child.list.addListSelectionListener { event: ListSelectionEvent? ->
if (!event!!.valueIsAdjusting) {
child.list.getSelectedValue()?.toString()?.let { levelName ->
setLevelPreview(levelName, levelIndex = child.list.selectedIndex)
}
}
}
}
}

override fun popupMenuWillBecomeInvisible(e: PopupMenuEvent?) {
levelChooserComboBox?.selectedItem?.toString()?.let { levelName ->
levelChooserComboBox?.selectedIndex?.let { levelIndex ->
setLevelPreview(levelName = levelName, levelIndex = levelIndex)
}
}
}

override fun popupMenuCanceled(e: PopupMenuEvent?) {}
},
)

randomLevelButton!!.text = "Zufällig"
randomLevelButton!!.addActionListener { _ -> randomLevelButtonActionPerformed() }
Expand Down Expand Up @@ -641,22 +673,9 @@ class ConfigurationPanel : JPanel() {
@Throws(Exception::class)
override fun doInBackground(): Any? {
synchronized(levelChooserComboBox!!) {
if (levelChooserComboBox!!.selectedItem != null) {
try {
if (levelChooserComboBox!!.isEnabled) {
stateProperties.setProperty(
PROPERTY_SELECTED_LEVEL,
levelChooserComboBox!!.selectedIndex.toString(),
)
}
val level = getInstance()!!
.loadLevel(levelChooserComboBox!!.selectedItem!!.toString())
gameManager.setLevel(level!!)
levelPreviewDisplayPanel!!.setLevel(level)
levelPreviewDisplayPanel!!.isOpaque = true
levelPreviewDisplayPanel!!.background = level.color
} catch (ex: CouldNotPerformException) {
logger.error("Could not update level preview!", ex)
levelChooserComboBox?.selectedItem?.toString()?.let { selectedItem ->
levelChooserComboBox?.selectedIndex?.let { selectedIndex ->
setLevelPreview(selectedItem, selectedIndex)
}
}
}
Expand All @@ -665,6 +684,25 @@ class ConfigurationPanel : JPanel() {
}.execute()
} // GEN-LAST:event_levelChooserComboBoxActionPerformed

private fun setLevelPreview(levelName: String, levelIndex: Int) {
try {
if (levelChooserComboBox!!.isEnabled) {
logger.error("set $levelIndex")
stateProperties.setProperty(
PROPERTY_SELECTED_LEVEL,
levelIndex.toString(),
)
}
val level = getInstance()!!.loadLevel(levelName)
gameManager.setLevel(level!!)
levelPreviewDisplayPanel!!.setLevel(level)
levelPreviewDisplayPanel!!.isOpaque = true
levelPreviewDisplayPanel!!.background = level.color
} catch (ex: CouldNotPerformException) {
logger.error("Could not update level preview!", ex)
}
}

private fun randomLevelButtonActionPerformed() =
levelChooserComboBox
?.takeIf { it.itemCount > 1 }
Expand Down