bpo-34548: IDLE: use configured theme colors in TextView (GH-9008)

bpo-34548: IDLE: use configured theme colors in TextView (GH-9008) · python/cpython@c87d9f4

3 files changed

lines changed

Original file line number	Diff line number	Diff line change
`@@ -31,11 +31,12 @@ def make_pat():`
`31`	`31`	`prog = re.compile(make_pat(), re.S)`
`32`	`32`	`idprog = re.compile(r"\s+(\w+)", re.S)`
`33`	`33`
`34`		`-def color_config(text): # Called from htest, Editor, and Turtle Demo.`
`35`		`-'''Set color opitons of Text widget.`
	`34`	`+def color_config(text):`
	`35`	`+"""Set color options of Text widget.`
`36`	`36`
`37`		`- Should be called whenever ColorDelegator is called.`
`38`		`- '''`
	`37`	`+ If ColorDelegator is used, this should be called first.`
	`38`	`+ """`
	`39`	`+# Called from htest, TextFrame, Editor, and Turtledemo.`
`39`	`40`	`# Not automatic because ColorDelegator does not know 'text'.`
`40`	`41`	`theme = idleConf.CurrentTheme()`
`41`	`42`	`normal_colors = idleConf.GetHighlight(theme, 'normal')`
`@@ -50,6 +51,7 @@ def color_config(text): # Called from htest, Editor, and Turtle Demo.`
`50`	`51`	`inactiveselectbackground=select_colors['background'], # new in 8.5`
`51`	`52`	`)`
`52`	`53`
	`54`	`+`
`53`	`55`	`class ColorDelegator(Delegator):`
`54`	`56`
`55`	`57`	`def __init__(self):`
`@@ -285,6 +287,7 @@ def _color_delegator(parent): # htest #`
`285`	`287`	`d = ColorDelegator()`
`286`	`288`	`p.insertfilter(d)`
`287`	`289`
	`290`	`+`
`288`	`291`	`if __name__ == "__main__":`
`289`	`292`	`from unittest import main`
`290`	`293`	`main('idlelib.idle_test.test_colorizer', verbosity=2, exit=False)`

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@`
`5`	`5`	`from tkinter.ttk import Frame, Scrollbar, Button`
`6`	`6`	`from tkinter.messagebox import showerror`
`7`	`7`
	`8`	`+from idlelib.colorizer import color_config`
	`9`	`+`
`8`	`10`
`9`	`11`	`class TextFrame(Frame):`
`10`	`12`	`"Display text with scrollbar."`
`@@ -18,12 +20,9 @@ def __init__(self, parent, rawtext):`
`18`	`20`	`super().__init__(parent)`
`19`	`21`	`self['relief'] = 'sunken'`
`20`	`22`	`self['height'] = 700`
`21`		`-# TODO: get fg/bg from theme.`
`22`		`-self.bg = '#ffffff'`
`23`		`-self.fg = '#000000'`
`24`	`23`
`25`		`-self.text = text = Text(self, wrap='word', highlightthickness=0,`
`26`		`- fg=self.fg, bg=self.bg)`
	`24`	`+self.text = text = Text(self, wrap='word', highlightthickness=0)`
	`25`	`+color_config(text)`
`27`	`26`	`self.scroll = scroll = Scrollbar(self, orient='vertical',`
`28`	`27`	`takefocus=False, command=text.yview)`
`29`	`28`	`text['yscrollcommand'] = scroll.set`

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Use configured color theme for read-only text views.`