Merge branch 'rf/imagepanel' into 'master'

Rf/imagepanel

See merge request fsl/fsleyes/widgets!20

CHANGELOG.rst

@@ -2,6 +2,18 @@ This document contains the ``fsleyes-widgets`` release history in reverse
 chronological order.
 
 
+0.6.2 (Under development)
+-------------------------
+
+
+Changed
+^^^^^^^
+
+
+* The :class:`.ImagePanel` does not update its minimum size based on the image
+  size - this is left entirely up to application code.
+
+
 0.6.1 (Friday May 11th 2018)
 ----------------------------
 

fsleyes_widgets/imagepanel.py

@@ -43,10 +43,6 @@ class ImagePanel(wx.Panel):
         """
         self.__image = image
 
-
-        if image is not None: self.SetMinSize(image.GetSize())
-        else:                 self.SetMinSize((0, 0))
-
         self.Refresh()
 
 
@@ -58,14 +54,6 @@ class ImagePanel(wx.Panel):
         ev.Skip()
 
 
-    def DoGetBestSize(self):
-        """Returns the size of the image being displayed.
-        """
-
-        if self.__image is None: return (0, 0)
-        else:                    return self.__image.GetSize()
-
-
     def Draw(self, ev=None):
         """Draws this ``ImagePanel``. The image is scaled to the current panel
         size.