8000 Merge pull request #9698 from anntzer/widget-bg · matplotlib/matplotlib@1ca3d1a · GitHub
[go: up one dir, main page]

Skip to content

Commit 1ca3d1a

Browse files
authored
Merge pull request #9698 from anntzer/widget-bg
Set widget background color to white.
2 parents 173d8bb + d5d553a commit 1ca3d1a

File tree

4 files changed

+13
-26
lines changed

4 files changed

+13
-26
lines changed

examples/user_interfaces/embedding_in_wx3_sgskip.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,10 +99,6 @@ def OnWhiz(self, evt):
9999

100100
self.canvas.draw()
101101

102-
def onEraseBackground(self, evt):
103-
# this is supposed to prevent redraw flicker on some X servers...
104-
pass
105-
106102

107103
class MyApp(wx.App):
108104
def OnInit(self):

lib/matplotlib/backends/backend_qt5.py

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -233,20 +233,12 @@ def _update_figure_dpi(self):
233233
@_allow_super_init
234234
def __init__(self, figure):
235235
_create_qApp()
236-
figure._original_dpi = figure.dpi
237-
238236
super(FigureCanvasQT, self).__init__(figure=figure)
239237

238+
figure._original_dpi = figure.dpi
240239
self.figure = figure
241240
self._update_figure_dpi()
242-
243-
w, h = self.get_width_height()
244-
self.resize(w, h)
245-
246-
self.setMouseTracking(True)
247-
# Key auto-repeat enabled by default
248-
self._keyautorepeat = True
249-
241+
self.resize(*self.get_width_height())
250242
# In cases with mixed resolution displays, we need to be careful if the
251243
# dpi_ratio changes - in this case we need to resize the canvas
252244
# accordingly. We could watch for screenChanged events from Qt, but
@@ -256,6 +248,13 @@ def __init__(self, figure):
256248
# needed.
257249
self._dpi_ratio_prev = None
258250

251+
self.setMouseTracking(True)
252+
# Key auto-repeat enabled by default
253+
self._keyautorepeat = True
254+
255+
palette = QtGui.QPalette(QtCore.Qt.white)
256+
self.setPalette(palette)
257+
259258
@property
260259
def _dpi_ratio(self):
261260
# Not available on Qt4 or some older Qt5.

lib/matplotlib/backends/backend_tkagg.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,8 @@ def __init__(self, figure, master=None, resize_callback=None):
176176
t1,t2,w,h = self.figure.bbox.bounds
177177
w, h = int(w), int(h)
178178
self._tkcanvas = Tk.Canvas(
179-
master=master, width=w, height=h, borderwidth=0,
180-
highlightthickness=0)
179+
master=master, background="white",
180+
width=w, height=h, borderwidth=0, highlightthickness=0)
181181
self._tkphoto = Tk.PhotoImage(
8000
182182
master=self._tkcanvas, width=w, height=h)
183183
self._tkcanvas.create_image(w//2, h//2, image=self._tkphoto)
@@ -661,7 +661,6 @@ class NavigationToolbar2TkAgg(NavigationToolbar2, Tk.Frame):
661661
def __init__(self, canvas, window):
662662
self.canvas = canvas
663663
self.window = window
664-
self._idle = True
665664
NavigationToolbar2.__init__(self, canvas)
666665

667666
def destroy(self, *args):

lib/matplotlib/backends/backend_wx.py

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -684,8 +684,8 @@ def do_nothing(*args, **kwargs):
684684
self.Bind(wx.EVT_MOUSE_CAPTURE_CHANGED, self._onCaptureLost)
685685
self.Bind(wx.EVT_MOUSE_CAPTURE_LOST, self._onCaptureLost)
686686

687-
# Reduce flicker.
688-
self.SetBackgroundStyle(wx.BG_STYLE_PAINT)
687+
self.SetBackgroundStyle(wx.BG_STYLE_PAINT) # Reduce flicker.
688+
self.SetBackgroundColour(wx.WHITE)
689689

690690
self.macros = {} # dict from wx id to seq of macros
691691

@@ -941,13 +941,6 @@ def _onPaint(self, evt):
941941
self.gui_repaint(drawDC=drawDC)
942942
evt.Skip()
943943

944-
def _onEraseBackground(self, evt):
945-
"""
946-
Called when window is redrawn; since we are blitting the entire
947-
image, we can leave this blank to suppress flicker.
948-
"""
949-
pass
950-
951944
def _onSize(self, evt):
952945
"""
953946
Called when wxEventSize is generated.

0 commit comments

Comments
 (0)
0