Author: chatellier Date: 2010-12-03 13:13:30 +0000 (Fri, 03 Dec 2010) New Revision: 352 Log: Fix accordion pane Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/widgets/AccordionPane.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/widgets/AccordionPaneSubPanel.java Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/widgets/AccordionPane.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/widgets/AccordionPane.java 2010-12-03 10:45:54 UTC (rev 351) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/widgets/AccordionPane.java 2010-12-03 13:13:30 UTC (rev 352) @@ -130,10 +130,10 @@ return; if (!showAnimation) { this.previouslySelected = -1; - doLayout(); // fix echatellier 20101202 strange , add this to display } - else + else { this.previouslySelected = selected; + } this.selected = num; for (int i = 0; i < children.size(); i++) { AccordionPaneSubPanel subPanel = (AccordionPaneSubPanel) children @@ -180,8 +180,9 @@ timer = new Timer(1, a); timer.start(); } - this.validate(); - this.repaint(); + doLayout(); // ec-20101202 : par moment ca fonctionne mal + validate(); + repaint(); } /** Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/widgets/AccordionPaneSubPanel.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/widgets/AccordionPaneSubPanel.java 2010-12-03 10:45:54 UTC (rev 351) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/widgets/AccordionPaneSubPanel.java 2010-12-03 13:13:30 UTC (rev 352) @@ -37,17 +37,18 @@ protected AccordionPane accordionPane; - JPanel titlePanel; - JLabel titleLabel; - JComponent child; - int index; - static Cursor handCursor = null; - static int mousePressedInd = -1; + protected JPanel titlePanel; + protected JLabel titleLabel; + protected JComponent child; + protected int index; + protected Cursor handCursor = null; + protected int mousePressedInd = -1; public AccordionPaneSubPanel() { this.setBorder(BorderFactory.createEtchedBorder()); - if (handCursor == null) + if (handCursor == null) { handCursor = new Cursor(Cursor.HAND_CURSOR); + } this.setLayout(new BorderLayout()); }