vertical scrollbar as needed both input and output area

qgis · Oct 31, 2012 · 66368f9 · 66368f9
1 parent c729a0d
commit 66368f9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/python/console.py b/python/console.py
@@ -281,6 +281,9 @@ def __init__(self, parent=None):
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.textEditOut.sizePolicy().hasHeightForWidth())
         self.textEditOut.setSizePolicy(sizePolicy)
+
+        self.textEditOut.setVerticalScrollBarPolicy(Qt.ScrollBarAsNeeded)
+        self.edit.setVerticalScrollBarPolicy(Qt.ScrollBarAsNeeded)
 
         self.clearButton.triggered.connect(self.textEditOut.clearConsole)
         self.optionsButton.triggered.connect(self.openSettings)

diff --git a/python/console_output.py b/python/console_output.py
@@ -106,7 +106,7 @@ def __init__(self, parent=None):
         #self.setEdgeColumn(80)
         #self.setEdgeColor(QColor("#FF0000")) 
 
-        self.SendScintilla(QsciScintilla.SCI_SETWRAPMODE, 2)  
+        self.setWrapMode(QsciScintilla.WrapCharacter)
         self.SendScintilla(QsciScintilla.SCI_SETHSCROLLBAR, 0)
 
         self.runShortcut = QShortcut(QKeySequence(Qt.CTRL + Qt.Key_E), self)

diff --git a/python/console_sci.py b/python/console_sci.py
@@ -92,13 +92,12 @@ def __init__(self, parent=None):
         # Use raw message to Scintilla here (all messages are documented
         # here: http://www.scintilla.org/ScintillaDoc.html)
         self.SendScintilla(QsciScintilla.SCI_SETHSCROLLBAR, 0)
-        self.SendScintilla(QsciScintilla.SCI_SETVSCROLLBAR, 1)
 
         # not too small
         #self.setMinimumSize(500, 300)
         self.setMinimumHeight(50)
-        
-        self.SendScintilla(QsciScintilla.SCI_SETWRAPMODE, 2)
+
+        self.setWrapMode(QsciScintilla.WrapCharacter)
         self.SendScintilla(QsciScintilla.SCI_EMPTYUNDOBUFFER)
 
         ## Disable command key