Makes Preferences/Options window resizable. Part of patch provided by Ingo Bauersachs + some adjustments specific to the Video configuration section.

2 files changed, 21 insertions, 5 deletions

diff --git a/src/net/java/sip/communicator/impl/gui/main/configforms/ConfigurationFrame.java b/src/net/java/sip/communicator/impl/gui/main/configforms/ConfigurationFrame.java
index 2859242..697c0b2 100644
--- a/src/net/java/sip/communicator/impl/gui/main/configforms/ConfigurationFrame.java
+++ b/src/net/java/sip/communicator/impl/gui/main/configforms/ConfigurationFrame.java
@@ -99,9 +99,8 @@ public class ConfigurationFrame
         centerPanel.setMinimumSize(new Dimension(600, 100));
         centerPanel.setMaximumSize(
             new Dimension(600, Integer.MAX_VALUE));
-        this.setResizable(false);
 
-        mainPanel.add(centerPanel, BorderLayout.SOUTH);
+        mainPanel.add(centerPanel, BorderLayout.CENTER);
 
         JComponent topComponent = createTopComponent();
         topComponent.add(configScrollList);
diff --git a/src/net/java/sip/communicator/impl/neomedia/MediaConfiguration.java b/src/net/java/sip/communicator/impl/neomedia/MediaConfiguration.java
index c1be3f2..59923d5 100644
--- a/src/net/java/sip/communicator/impl/neomedia/MediaConfiguration.java
+++ b/src/net/java/sip/communicator/impl/neomedia/MediaConfiguration.java
@@ -702,19 +702,36 @@ public class MediaConfiguration
             @Override

             public void mouseClicked(MouseEvent e)

             {

+                // Indicates if currently the panel is shown or hidden.

+                boolean isCurrentlyVisible = centerAdvancedPanel.isVisible();

+                // We save the current advanced panel height that we'd use

+                // in the case we're going to hide the panel.

+                int currentHeight = advancedPanel.getHeight();

+

                 advButton.setIcon(

                         NeomediaActivator.getResources().getImage(

-                                centerAdvancedPanel.isVisible()

+                                    isCurrentlyVisible

                                     ? "service.gui.icons.RIGHT_ARROW_ICON"

                                     : "service.gui.icons.DOWN_ARROW_ICON"));

 

-                centerAdvancedPanel.setVisible(

-                        !centerAdvancedPanel.isVisible());

+                centerAdvancedPanel.setVisible(!isCurrentlyVisible);

 

                 advancedPanel.revalidate();

 

                 NeomediaActivator.getUIService().getConfigurationContainer()

                    .validateCurrentForm();

+

+                Window window = SwingUtilities.getWindowAncestor(advancedPanel);

+

+                if (window != null)

+                {

+                    if (!isCurrentlyVisible)

+                        window.setSize(window.getWidth(),

+                            window.getHeight() + advancedPanel.getHeight());

+                    else

+                        window.setSize(window.getWidth(),

+                            window.getHeight() - currentHeight);

+                }

             }

         });