Merge "Fix urwid > 2.4.2 compatibility"
This commit is contained in:
commit
5b577fd116
@ -62,6 +62,10 @@ class FixedRadioButton(urwid.RadioButton):
|
|||||||
return (len(self.get_label())+4, 1)
|
return (len(self.get_label())+4, 1)
|
||||||
|
|
||||||
class TableColumn(urwid.Pile):
|
class TableColumn(urwid.Pile):
|
||||||
|
def sizing(self):
|
||||||
|
"""Explicit declare flow sizing due to the custom pack method."""
|
||||||
|
return frozenset((urwid.FLOW,))
|
||||||
|
|
||||||
def pack(self, size, focus=False):
|
def pack(self, size, focus=False):
|
||||||
maxcol = size[0]
|
maxcol = size[0]
|
||||||
mx = max([i[0].pack((maxcol,), focus)[0] for i in self.contents])
|
mx = max([i[0].pack((maxcol,), focus)[0] for i in self.contents])
|
||||||
@ -104,7 +108,6 @@ class MyEdit(urwid.Edit):
|
|||||||
super(MyEdit, self).__init__(*args, **kw)
|
super(MyEdit, self).__init__(*args, **kw)
|
||||||
|
|
||||||
def keypress(self, size, key):
|
def keypress(self, size, key):
|
||||||
(maxcol,) = size
|
|
||||||
if self._command_map[key] == keymap.YANK:
|
if self._command_map[key] == keymap.YANK:
|
||||||
text = self.ring.yank()
|
text = self.ring.yank()
|
||||||
if text:
|
if text:
|
||||||
@ -349,6 +352,13 @@ class Searchable(object):
|
|||||||
class HyperText(urwid.Text):
|
class HyperText(urwid.Text):
|
||||||
_selectable = True
|
_selectable = True
|
||||||
|
|
||||||
|
def sizing(self):
|
||||||
|
"""Explicit declare flow sizing due to the custom pack method.
|
||||||
|
|
||||||
|
Normal Text can be rendered as FIXED.
|
||||||
|
"""
|
||||||
|
return frozenset((urwid.FLOW,))
|
||||||
|
|
||||||
def __init__(self, markup, align=urwid.LEFT, wrap=urwid.SPACE, layout=None):
|
def __init__(self, markup, align=urwid.LEFT, wrap=urwid.SPACE, layout=None):
|
||||||
self._mouse_press_item = None
|
self._mouse_press_item = None
|
||||||
self.selectable_items = []
|
self.selectable_items = []
|
||||||
|
Loading…
Reference in New Issue
Block a user