Skip to content

bpo-37902: IDLE: Add scrolling for IDLE browsers #15360

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

Closed
GeeTransit wants to merge 2 commits into from
Closed

bpo-37902: IDLE: Add scrolling for IDLE browsers #15360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4818e7d
bpo-37902: IDLE: Add scrolling for IDLE browsers
GeeTransit Aug 21, 2019
f608056
Update NEWS.txt
GeeTransit Aug 21, 2019
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
2 changes: 2 additions & 0 deletions Lib/idlelib/NEWS.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ Released on 2019-10-20?
======================================


bpo-37902: Add scrolling for IDLE browsers.

bpo-37849: Fix completions list appearing too high or low when shown
above the current line.

Expand Down
38 changes: 38 additions & 0 deletions Lib/idlelib/tree.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,8 +260,20 @@ def drawtext(self):
anchor="nw", window=self.label)
self.label.bind("<1>", self.select_or_edit)
self.label.bind("<Double-1>", self.flip)
self.label.bind("<MouseWheel>", self.mousescroll)
self.label.bind("<Button-4>", self.mousescroll)
self.label.bind("<Button-5>", self.mousescroll)
self.text_id = id

def mousescroll(self, event):
up = {
EventType.MouseWheel: event.delta > 0,
EventType.Button: event.num == 4,
}
lines = (-5 if up[event.type] else 5)
self.canvas.yview_scroll(lines, "units")
return "break"

def select_or_edit(self, event=None):
if self.selected and self.item.IsEditable():
self.edit(event)
Expand Down Expand Up @@ -410,42 +422,68 @@ def GetSubList(self):
# A canvas widget with scroll bars and some useful bindings

class ScrolledCanvas:

Copy link
Copy Markdown
Member

@terryjreedy terryjreedy Aug 21, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reformatting existing code is not part of this issue and a distraction from the real implementation problems. I would do it differently, but on another issue sometime in the future.

def __init__(self, master, **opts):
if 'yscrollincrement' not in opts:
opts['yscrollincrement'] = 17

self.master = master

self.frame = Frame(master)
self.frame.rowconfigure(0, weight=1)
self.frame.columnconfigure(0, weight=1)

self.canvas = Canvas(self.frame, **opts)
self.canvas.grid(row=0, column=0, sticky="nsew")

self.vbar = Scrollbar(self.frame, name="vbar")
self.vbar.grid(row=0, column=1, sticky="nse")
self.hbar = Scrollbar(self.frame, name="hbar", orient="horizontal")
self.hbar.grid(row=1, column=0, sticky="ews")

self.canvas['yscrollcommand'] = self.vbar.set
self.vbar['command'] = self.canvas.yview
self.canvas['xscrollcommand'] = self.hbar.set
self.hbar['command'] = self.canvas.xview

self.canvas.bind("<Key-Prior>", self.page_up)
self.canvas.bind("<Key-Next>", self.page_down)
self.canvas.bind("<Key-Up>", self.unit_up)
self.canvas.bind("<Key-Down>", self.unit_down)

self.canvas.bind("<MouseWheel>", self.mousescroll)
self.canvas.bind("<Button-4>", self.mousescroll)
self.canvas.bind("<Button-5>", self.mousescroll)

#if isinstance(master, Toplevel) or isinstance(master, Tk):
self.canvas.bind("<Alt-Key-2>", self.zoom_height)
self.canvas.focus_set()

def page_up(self, event):
self.canvas.yview_scroll(-1, "page")
return "break"

def page_down(self, event):
self.canvas.yview_scroll(1, "page")
return "break"

def unit_up(self, event):
self.canvas.yview_scroll(-1, "unit")
return "break"

def unit_down(self, event):
self.canvas.yview_scroll(1, "unit")
return "break"

def mousescroll(self, event):
up = {
EventType.MouseWheel: event.delta > 0,
EventType.Button: event.num == 4,
}
lines = (-5 if up[event.type] else 5)
self.canvas.yview_scroll(lines, "units")
return "break"

def zoom_height(self, event):
zoomheight.zoom_height(self.master)
return "break"
Expand Down