Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: de1c054b by Tony CHEMIT at 2017-07-26T11:50:52+02:00 Les formulaires ne sont pas bien organisé lors de leur ouverture (See #798) - - - - - 6 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jaxx - application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jcss - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIManager.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUI.jcss - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jaxx ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jaxx @@ -95,7 +95,7 @@ org.jdesktop.swingx.JXTitledPanel java.util.Locale - + java.awt.Dimension javax.swing.BoxLayout javax.swing.JComponent javax.swing.UIManager ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jcss ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jcss @@ -452,6 +452,10 @@ JSplitPane { //enabled: {!model.isBusy()}; } +#emptySelection { + preferredSize:{new Dimension(200,400)}; +} + #emptySelectionLabel { horizontalAlignment : {JLabel.CENTER}; verticalAlignment : {JLabel.CENTER}; ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java @@ -349,6 +349,9 @@ public abstract class ContentUIHandler<E extends IdDto, U extends ContentUI<E, U grabFocusOnform(); + // we want to see the hole form on screen + ui.setMinimumSize(ui.getPreferredSize()); + } /** ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIManager.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIManager.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIManager.java @@ -123,8 +123,9 @@ public class ContentUIManager { UIHelper.handlingError(e); } finally { - // on affiche l'ui quoi qu'il arrive ? getLayout().show(getLayoutContent(), constraints); + + getMainUI().getSplitpane2().setDividerLocation(getMainUI().getSplitpane2().getMinimumDividerLocation()+25); } } ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUI.jcss ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUI.jcss @@ -39,7 +39,7 @@ #emptyLabel { text: {getEmptyListMessage()}; horizontalAlignment: center; - //enabled:false; + preferredSize:{new Dimension(200,400)}; } #listHeader { ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java @@ -43,6 +43,7 @@ import javax.swing.Icon; import javax.swing.JLabel; import javax.swing.JList; import javax.swing.ListCellRenderer; +import javax.swing.ScrollPaneConstants; import javax.swing.SwingUtilities; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; @@ -178,6 +179,10 @@ public abstract class ContentListUIHandler<E extends IdDto, C extends DataDto, U getUi().getListSelectionModel().clearSelection(); if (!getModel().isEmpty()) { getUi().getListSelectionModel().setSelectionInterval(0, 0); + getUi().getListPane().setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED); + } else { + +getUi().getListPane().setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_NEVER); } }); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/de1c054b8440da7a643eeb7b565d... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/de1c054b8440da7a643eeb7b565d... You're receiving this email because of your account on gitlab.com.