Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 264f6b5f by tchemit at 2019-02-14T14:46:39Z L'asssitant sauvegarde a un comportement étonnant - Closes #1228 - - - - - 4bd72e53 by tchemit at 2019-02-14T14:46:39Z A la ré ouverture de l'UI, l'affichage est partiel - See #1224 - - - - - 2 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/storage/tabs/BackupUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTreeCellRenderer.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/storage/tabs/BackupUIHandler.java ===================================== @@ -25,6 +25,7 @@ package fr.ird.observe.client.ui.storage.tabs; import fr.ird.observe.client.ui.ObserveKeyStrokes; import fr.ird.observe.client.ui.storage.StorageStep; import fr.ird.observe.client.ui.util.UIHelper; +import org.apache.commons.lang3.StringUtils; import org.nuiton.jaxx.runtime.spi.UIHandler; import javax.swing.AbstractAction; @@ -90,7 +91,9 @@ public class BackupUIHandler extends StorageTabUIHandler<BackupUI> implements UI } public void changeFilename(String filename) { - ui.getModel().setBackupFile(new File(ui.getDirectoryText().getText(), filename)); + if (StringUtils.isNoneEmpty(filename)) { + ui.getModel().setBackupFile(new File(ui.getDirectoryText().getText(), filename)); + } } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTreeCellRenderer.java ===================================== @@ -33,6 +33,7 @@ import javax.swing.JTree; import javax.swing.tree.DefaultTreeCellRenderer; import java.awt.Color; import java.awt.Component; +import java.awt.Dimension; /** * Created on 14/11/16. @@ -86,6 +87,14 @@ public class NavigationTreeCellRenderer extends DefaultTreeCellRenderer implemen JLabel comp = (JLabel) super.getTreeCellRendererComponent(tree, text, sel, expanded, leaf, row, hasFocus); comp.setToolTipText(text); comp.setIcon(icon); + Dimension size = comp.getPreferredSize(); + double height = size.getHeight(); + if (height > 50) { + log.error(String.format("Size is amazing: %s for node: %s", size, text)); + Dimension newSize = new Dimension((int) size.getWidth(), 32); + comp.setSize(newSize); + comp.setPreferredSize(newSize); + } return comp; } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/910ad8213b54f377666db2ec5da... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/910ad8213b54f377666db2ec5da... You're receiving this email because of your account on gitlab.com.
participants (1)
-
Tony CHEMIT