##// END OF EJS Templates
protect Widget._style_sheet_changed from being called before _control exists...
MinRK -
Show More
@@ -138,6 +138,11 b' class ConsoleWidget(LoggingConfigurable, QtGui.QWidget):'
138
138
139 #------ Protected class variables ------------------------------------------
139 #------ Protected class variables ------------------------------------------
140
140
141 # control handles
142 _control = None
143 _page_control = None
144 _splitter = None
145
141 # When the control key is down, these keys are mapped.
146 # When the control key is down, these keys are mapped.
142 _ctrl_down_remap = { QtCore.Qt.Key_B : QtCore.Qt.Key_Left,
147 _ctrl_down_remap = { QtCore.Qt.Key_B : QtCore.Qt.Key_Left,
143 QtCore.Qt.Key_F : QtCore.Qt.Key_Right,
148 QtCore.Qt.Key_F : QtCore.Qt.Key_Right,
@@ -182,8 +187,6 b' class ConsoleWidget(LoggingConfigurable, QtGui.QWidget):'
182 layout = QtGui.QStackedLayout(self)
187 layout = QtGui.QStackedLayout(self)
183 layout.setContentsMargins(0, 0, 0, 0)
188 layout.setContentsMargins(0, 0, 0, 0)
184 self._control = self._create_control()
189 self._control = self._create_control()
185 self._page_control = None
186 self._splitter = None
187 if self.paging in ('hsplit', 'vsplit'):
190 if self.paging in ('hsplit', 'vsplit'):
188 self._splitter = QtGui.QSplitter()
191 self._splitter = QtGui.QSplitter()
189 if self.paging == 'hsplit':
192 if self.paging == 'hsplit':
@@ -533,13 +533,15 b' class IPythonWidget(FrontendWidget):'
533 """ Set the style sheets of the underlying widgets.
533 """ Set the style sheets of the underlying widgets.
534 """
534 """
535 self.setStyleSheet(self.style_sheet)
535 self.setStyleSheet(self.style_sheet)
536 if self._control is not None:
536 self._control.document().setDefaultStyleSheet(self.style_sheet)
537 self._control.document().setDefaultStyleSheet(self.style_sheet)
537 if self._page_control:
538 self._page_control.document().setDefaultStyleSheet(self.style_sheet)
539
540 bg_color = self._control.palette().window().color()
538 bg_color = self._control.palette().window().color()
541 self._ansi_processor.set_background_color(bg_color)
539 self._ansi_processor.set_background_color(bg_color)
542
540
541 if self._page_control is not None:
542 self._page_control.document().setDefaultStyleSheet(self.style_sheet)
543
544
543
545
544 def _syntax_style_changed(self):
546 def _syntax_style_changed(self):
545 """ Set the style for the syntax highlighter.
547 """ Set the style for the syntax highlighter.
General Comments 0
You need to be logged in to leave comments. Login now