summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTerry Jan Reedy <tjreedy@udel.edu>2012-05-26 20:50:30 (GMT)
committerTerry Jan Reedy <tjreedy@udel.edu>2012-05-26 20:50:30 (GMT)
commit1a0df94db3786aac7624e9bcb6922b87d4498692 (patch)
tree46c58b76612e875d7c23c28f458e7fa0666c06cd
parentee2bbed9252fe286bc14765992877e1502b70328 (diff)
parent809309a4822124f46dc98514ccdf818564215f30 (diff)
downloadcpython-1a0df94db3786aac7624e9bcb6922b87d4498692.zip
cpython-1a0df94db3786aac7624e9bcb6922b87d4498692.tar.gz
cpython-1a0df94db3786aac7624e9bcb6922b87d4498692.tar.bz2
Merge Issue #14876: Use user-selected font for highlight configuration.
Patch by Roger Serwy.
-rw-r--r--Lib/idlelib/configDialog.py6
-rw-r--r--Misc/NEWS2
2 files changed, 6 insertions, 2 deletions
diff --git a/Lib/idlelib/configDialog.py b/Lib/idlelib/configDialog.py
index d09fb5e..2701b42 100644
--- a/Lib/idlelib/configDialog.py
+++ b/Lib/idlelib/configDialog.py
@@ -187,7 +187,7 @@ class ConfigDialog(Toplevel):
text=' Highlighting Theme ')
#frameCustom
self.textHighlightSample=Text(frameCustom,relief=SOLID,borderwidth=1,
- font=('courier',12,''),cursor='hand2',width=21,height=10,
+ font=('courier',12,''),cursor='hand2',width=21,height=11,
takefocus=FALSE,highlightthickness=0,wrap=NONE)
text=self.textHighlightSample
text.bind('<Double-Button-1>',lambda e: 'break')
@@ -821,8 +821,10 @@ class ConfigDialog(Toplevel):
fontWeight=tkFont.BOLD
else:
fontWeight=tkFont.NORMAL
- self.editFont.config(size=self.fontSize.get(),
+ size=self.fontSize.get()
+ self.editFont.config(size=size,
weight=fontWeight,family=fontName)
+ self.textHighlightSample.configure(font=(fontName, size, fontWeight))
def SetHighlightTarget(self):
if self.highlightTarget.get()=='Cursor': #bg not possible
diff --git a/Misc/NEWS b/Misc/NEWS
index 50060e5..e26f54d 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -60,6 +60,8 @@ Library
new features through new policies. Note that Policy.must_be_7bit is renamed
to cte_type.
+- Issue #14876: Use user-selected font for highlight configuration.
+
- Issue #14920: Fix the help(urllib.parse) failure on locale C on terminals.
Have ascii characters in help.