Mercurial Repositories > eric / file diff

--- a/QScintilla/MiniEditor.py	Fri Jan 20 18:54:06 2012 +0100
+++ b/QScintilla/MiniEditor.py	Sat Jan 21 15:01:53 2012 +0100
@@ -2205,6 +2205,10 @@
             Preferences.getEditorColour("SearchMarkers"))
         
         self.__textEdit.setCursorFlashTime(QApplication.cursorFlashTime())
+        
+        if Preferences.getEditor("OverrideEditAreaColours"):
+            self.__textEdit.setColor(Preferences.getEditorColour("EditAreaForeground"))
+            self.__textEdit.setPaper(Preferences.getEditorColour("EditAreaBackground"))
     
     def __setEolMode(self):
         """
@@ -2427,6 +2431,10 @@
         self.__textEdit.setLexer()
         self.__setMonospaced(self.useMonospaced)
         
+        if Preferences.getEditor("OverrideEditAreaColours"):
+            self.__textEdit.setColor(Preferences.getEditorColour("EditAreaForeground"))
+            self.__textEdit.setPaper(Preferences.getEditorColour("EditAreaBackground"))
+        
     def setLanguage(self, filename, initTextDisplay=True, pyname=""):
         """
         Public method to set a lexer language.
@@ -2519,6 +2527,9 @@
         # now set the lexer properties
         self.lexer_.initProperties()
         
+        self.lexer_.setDefaultColor(self.lexer_.color(0))
+        self.lexer_.setDefaultPaper(self.lexer_.paper(0))
+        
     def __isPy2File(self):
         """
         Private method to return a flag indicating a Python 2 file.