8000 [3.13] gh-122392: IDLE - Fix overlapping lines in browsers (GH-122392) (GH-124975) by miss-islington · Pull Request #125061 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

[3.13] gh-122392: IDLE - Fix overlapping lines in browsers (GH-122392) (GH-124975) #125061

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 7, 2024
Merged

[3.13] gh-122392: IDLE - Fix overlapping lines in browsers (GH-122392) (GH-124975) #125061

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
gh-122392: IDLE - Fix overlapping lines in browsers (GH-122392) (GH-1… 
…24975)

Increase currently inadequate vertical spacing for the IDLE browsers (path,
module, and stack) on high-resolution monitors.
---------

(cherry picked from commit c5df1cb)

Co-authored-by: Zhikang Yan <2951256653@qq.com>
Co-author
8000
ed-by: Terry Jan Reedy <tjreedy@udel.edu>
  • Loading branch information
@Xiaokang2022 @terryjreedy @miss-islington
2 people authored and miss-islington committed Oct 7, 2024
commit 8ccb1fde9355d0f688f806eade80e79635310f5b
14 changes: 10 additions & 4 deletions Lib/idlelib/tree.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ def wheel_event(event, widget=None):

class TreeNode:

dy = 0

def __init__(self, canvas, parent, item):
self.canvas = canvas
self.parent = parent
Expand Down Expand Up @@ -199,23 +201,22 @@ def update(self):

def draw(self, x, y):
# XXX This hard-codes too many geometry constants!
dy = 20
self.x, self.y = x, y
self.drawicon()
self.drawtext()
if self.state != 'expanded':
return y + dy
return y + TreeNode.dy
# draw children
if not self.children:
sublist = self.item._GetSubList()
if not sublist:
# _IsExpandable() was mistaken; that's allowed
return y+17
return y + TreeNode.dy
for item in sublist:
child = self.__class__(self.canvas, self, item)
self.children.append(child)
cx = x+20
cy = y + dy
cy = y + TreeNode.dy
cylast = 0
for child in self.children:
cylast = cy
Expand Down Expand Up @@ -289,6 +290,11 @@ def drawtext(self):
self.label.bind("<Button-4>", lambda e: wheel_event(e, self.canvas))
self.label.bind("<Button-5>", lambda e: wheel_event(e, self.canvas))
self.text_id = id
if TreeNode.dy == 0:
# The first row doesn't matter what the dy is, just measure its
# size to get the value of the subsequent dy
coords = self.canvas.bbox(id)
TreeNode.dy = max(20, coords[3] - coords[1] - 3)

def select_or_edit(self, event=None):
if self.selected and self.item.IsEditable():
Expand Down
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/IDLE/2024-10-04-15-34-34.gh-issue-122392.V8K3w2.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Increase currently inadequate vertical spacing for the IDLE browsers (path,
module, and stack) on high-resolution monitors.
Loading
0