Merge pull request #2674 from mhils/issue-2620

Fix #2620
This commit is contained in:
Aldo Cortesi 2017-12-15 10:05:40 +13:00 committed by GitHub
commit 21324086c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -156,12 +156,14 @@ class Window(urwid.Frame):
w = urwid.Pile( w = urwid.Pile(
[ [
wrapped(i) for i, s in enumerate(self.stacks) wrapped(i) for i, s in enumerate(self.stacks)
] ],
focus_item=self.pane
) )
else: else:
w = urwid.Columns( w = urwid.Columns(
[wrapped(i) for i, s in enumerate(self.stacks)], [wrapped(i) for i, s in enumerate(self.stacks)],
dividechars=1 dividechars=1,
focus_column=self.pane
) )
self.body = urwid.AttrWrap(w, "background") self.body = urwid.AttrWrap(w, "background")
@ -270,13 +272,12 @@ class Window(urwid.Frame):
return True return True
def keypress(self, size, k): def keypress(self, size, k):
if self.focus_part == "footer": k = super().keypress(size, k)
return super().keypress(size, k) if k:
else: return self.master.keymap.handle(
fs = self.focus_stack().top_widget() self.focus_stack().top_widget().keyctx,
k = fs.keypress(size, k) k
if k: )
return self.master.keymap.handle(fs.keyctx, k)
class Screen(urwid.raw_display.Screen): class Screen(urwid.raw_display.Screen):