Merge pull request #2421 from neilweinstock/texture-pulldown

Updated texture select combobox
This commit is contained in:
Sibo Van Gool 2023-12-28 00:17:31 +01:00 committed by GitHub
commit e056e6ed07
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 2 deletions

View File

@ -2393,7 +2393,7 @@ PresetModel.lbl.partsLib = Parts Library
PresetModel.lbl.partsLib.ttip = Select a preset model for this rocket component from a library of parts.
DecalModel.lbl.select = <none>
DecalModel.lbl.choose = From file\u2026
DecalModel.lbl.choose = Select file\u2026
! Export Decal Dialog
ExportDecalDialog.title = Export Decal

View File

@ -1799,7 +1799,7 @@ PresetModel.lbl.custompreset = Custom
PresetModel.lbl.partsLib = Parts Library
DecalModel.lbl.select = <none>
DecalModel.lbl.choose = From file...
DecalModel.lbl.choose = Select file...
! Export Decal Dialog
ExportDecalDialog.title = Export Decal

View File

@ -505,6 +505,7 @@ public class AppearancePanel extends JPanel {
DecalModel decalModel = new DecalModel(panel, document, builder);
JComboBox<DecalImage> textureDropDown = new JComboBox<DecalImage>(decalModel);
textureDropDown.setMaximumRowCount(20);
// We need to add this action listener that triggers a decalModel update when the same item is selected, because
// for multi-comp edits, the listeners' decals may not be updated otherwise