Mercurial Repositories > eric / file diff

--- a/QScintilla/SearchReplaceWidget.py	Mon Feb 02 19:39:06 2015 +0100
+++ b/QScintilla/SearchReplaceWidget.py	Tue Feb 03 19:36:29 2015 +0100
@@ -159,11 +159,7 @@
         self.findPrevAct.setEnabled(False)
         self.ui.findtextCombo.addAction(self.findPrevAct)
         
-        self.ensurePolished()
-        msh = self.minimumSizeHint()
-        self.resize(max(self.width(), msh.width()),
-                    max(self.height(), msh.height())
-                    )
+        self.adjustSize()
         
         self.havefound = False
         self.__pos = None
@@ -178,11 +174,7 @@
         @param evt event containing the state change (QEvent)
         """
         if evt.type() == QEvent.FontChange:
-            self.ensurePolished()
-            msh = self.minimumSizeHint()
-            self.resize(max(self.width(), msh.width()),
-                        max(self.height(), msh.height())
-                        )
+            self.adjustSize()
     
     def __selectionBoundary(self, selections=None):
         """
@@ -907,7 +899,6 @@
         
         self.__searchReplaceWidget = \
             SearchReplaceWidget(replace, vm, self, True)
-        srHeight = self.__searchReplaceWidget.height()
         
         self.__layout = QHBoxLayout(self)
         self.setLayout(self.__layout)
@@ -924,7 +915,6 @@
         self.__scroller.setWidget(self.__searchReplaceWidget)
         self.__scroller.setSizePolicy(
             QSizePolicy.Expanding, QSizePolicy.Minimum)
-        self.__scroller.setMaximumHeight(srHeight)
         self.__scroller.setFrameShape(QFrame.NoFrame)
         self.__scroller.setVerticalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
         self.__scroller.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
@@ -940,13 +930,25 @@
         self.__layout.addWidget(self.__scroller)
         self.__layout.addWidget(self.__rightButton)
         
-        self.setMaximumHeight(srHeight)
+        self.setMaximumHeight(self.__searchReplaceWidget.sizeHint().height())
+        self.adjustSize()
         
         self.__searchReplaceWidget.searchListChanged.connect(
             self.searchListChanged)
         self.__leftButton.clicked.connect(self.__slideLeft)
         self.__rightButton.clicked.connect(self.__slideRight)
     
+    def changeEvent(self, evt):
+        """
+        Protected method handling state changes.
+
+        @param evt event containing the state change (QEvent)
+        """
+        if evt.type() == QEvent.FontChange:
+            self.setMaximumHeight(
+                self.__searchReplaceWidget.sizeHint().height())
+            self.adjustSize()
+    
     def findNext(self):
         """
         Public slot to find the next occurrence of text.