Mercurial Repositories > eric / changeset

--- a/APIs/Python3/eric6.api	Sat Sep 05 12:01:13 2015 +0200
+++ b/APIs/Python3/eric6.api	Sat Sep 05 13:49:08 2015 +0200
@@ -7866,6 +7866,7 @@
 eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.showUserList?4(id, lst)
 eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.startStyling?4(pos, mask)
 eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.styleAt?4(pos)
+eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.updateVerticalScrollBar?4()
 eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.zoomIn?4(zoom=1)
 eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.zoomOut?4(zoom=1)
 eric6.QScintilla.QsciScintillaCompat.QsciScintillaCompat.zoomTo?4(zoom)

Binary file Documentation/Help/source.qch has changed

--- a/Documentation/Help/source.qhp	Sat Sep 05 12:01:13 2015 +0200
+++ b/Documentation/Help/source.qhp	Sat Sep 05 13:49:08 2015 +0200
@@ -9970,6 +9970,7 @@
       <keyword name="QsciScintillaCompat.showUserList" id="QsciScintillaCompat.showUserList" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.showUserList" />
       <keyword name="QsciScintillaCompat.startStyling" id="QsciScintillaCompat.startStyling" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.startStyling" />
       <keyword name="QsciScintillaCompat.styleAt" id="QsciScintillaCompat.styleAt" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.styleAt" />
+      <keyword name="QsciScintillaCompat.updateVerticalScrollBar" id="QsciScintillaCompat.updateVerticalScrollBar" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.updateVerticalScrollBar" />
       <keyword name="QsciScintillaCompat.zoomIn" id="QsciScintillaCompat.zoomIn" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.zoomIn" />
       <keyword name="QsciScintillaCompat.zoomOut" id="QsciScintillaCompat.zoomOut" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.zoomOut" />
       <keyword name="QsciScintillaCompat.zoomTo" id="QsciScintillaCompat.zoomTo" ref="eric6.QScintilla.QsciScintillaCompat.html#QsciScintillaCompat.zoomTo" />

--- a/Documentation/Source/eric6.QScintilla.QsciScintillaCompat.html	Sat Sep 05 12:01:13 2015 +0200
+++ b/Documentation/Source/eric6.QScintilla.QsciScintillaCompat.html	Sat Sep 05 13:49:08 2015 +0200
@@ -379,6 +379,9 @@
 <td><a href="#QsciScintillaCompat.styleAt">styleAt</a></td>
 <td>Public method to get the style at a position in the text.</td>
 </tr><tr>
+<td><a href="#QsciScintillaCompat.updateVerticalScrollBar">updateVerticalScrollBar</a></td>
+<td>Public method to update the vertical scroll bar to reflect the additional lines added by annotations.</td>
+</tr><tr>
 <td><a href="#QsciScintillaCompat.zoomIn">zoomIn</a></td>
 <td>Public method used to increase the zoom factor.</td>
 </tr><tr>
@@ -1669,7 +1672,13 @@
 style at the requested position or 0, if the position
             is negative or past the end of the document (integer)
 </dd>
-</dl><a NAME="QsciScintillaCompat.zoomIn" ID="QsciScintillaCompat.zoomIn"></a>
+</dl><a NAME="QsciScintillaCompat.updateVerticalScrollBar" ID="QsciScintillaCompat.updateVerticalScrollBar"></a>
+<h4>QsciScintillaCompat.updateVerticalScrollBar</h4>
+<b>updateVerticalScrollBar</b>(<i></i>)
+<p>
+        Public method to update the vertical scroll bar to reflect the
+        additional lines added by annotations.
+</p><a NAME="QsciScintillaCompat.zoomIn" ID="QsciScintillaCompat.zoomIn"></a>
 <h4>QsciScintillaCompat.zoomIn</h4>
 <b>zoomIn</b>(<i>zoom=1</i>)
 <p>

--- a/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py	Sat Sep 05 12:01:13 2015 +0200
+++ b/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py	Sat Sep 05 13:49:08 2015 +0200
@@ -715,6 +715,8 @@
             else:
                 editor.toggleWarning(
                     lineno, 0, True, message, warningType=editor.WarningStyle)
+            
+            editor.updateVerticalScrollBar()
     
     @pyqtSlot()
     def on_resultList_itemSelectionChanged(self):
@@ -761,6 +763,9 @@
             if file not in errorFiles:
                 editor = vm.getOpenEditor(file)
                 editor.clearStyleWarnings()
+        
+        editor = vm.activeWindow()
+        editor.updateVerticalScrollBar()
     
     @pyqtSlot()
     def on_statisticsButton_clicked(self):

--- a/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py	Sat Sep 05 12:01:13 2015 +0200
+++ b/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py	Sat Sep 05 13:49:08 2015 +0200
@@ -405,13 +405,14 @@
         if self.noResults:
             return
         
+        vm = e5App().getObject("ViewManager")
+        
         if itm.parent():
             fn = Utilities.normabspath(itm.data(0, self.filenameRole))
             lineno = itm.data(0, self.lineRole)
             index = itm.data(0, self.indexRole)
             error = itm.data(0, self.errorRole)
             
-            vm = e5App().getObject("ViewManager")
             vm.openSourceFile(fn, lineno)
             editor = vm.getOpenEditor(fn)
             
@@ -421,7 +422,6 @@
                 editor.toggleSyntaxError(lineno, index, True, error, show=True)
         else:
             fn = Utilities.normabspath(itm.data(0, self.filenameRole))
-            vm = e5App().getObject("ViewManager")
             vm.openSourceFile(fn)
             editor = vm.getOpenEditor(fn)
             for index in range(itm.childCount()):
@@ -435,6 +435,9 @@
                     editor.toggleSyntaxError(
                         lineno, index, True, error, show=True)
         
+        editor = vm.activeWindow()
+        editor.updateVerticalScrollBar()
+        
     @pyqtSlot()
     def on_showButton_clicked(self):
         """
@@ -480,6 +483,9 @@
                 editor.clearSyntaxError()
                 editor.clearFlakesWarnings()
         
+        editor = vm.activeWindow()
+        editor.updateVerticalScrollBar()
+        
     def __clearErrors(self, files):
         """
         Private method to clear all error and warning markers of

--- a/QScintilla/Editor.py	Sat Sep 05 12:01:13 2015 +0200
+++ b/QScintilla/Editor.py	Sat Sep 05 13:49:08 2015 +0200
@@ -5395,6 +5395,8 @@
         warnings = problems.get('warnings', [])
         for _fn, lineno, col, code, msg in warnings:
             self.toggleWarning(lineno, col, True, msg)
+        
+        self.updateVerticalScrollBar()
  
     def __initOnlineSyntaxCheck(self):
         """

--- a/QScintilla/QsciScintillaCompat.py	Sat Sep 05 12:01:13 2015 +0200
+++ b/QScintilla/QsciScintillaCompat.py	Sat Sep 05 13:49:08 2015 +0200
@@ -1467,6 +1467,15 @@
         """
         self.activateWindow()
     
+    def updateVerticalScrollBar(self):
+        """
+        Public method to update the vertical scroll bar to reflect the
+        additional lines added by annotations.
+        """
+        # Workaround because Scintilla.Redraw isn't implemented
+        self.SendScintilla(QsciScintilla.SCI_SETVSCROLLBAR, 0)
+        self.SendScintilla(QsciScintilla.SCI_SETVSCROLLBAR, 1)
+    
     ###########################################################################
     ## utility methods
     ###########################################################################