pep/poezio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix blinking in ImageWin.

Browse source 
Also display the border according to the theme.
This commit is contained in:
Emmanuel Gil Peyrot 2018-01-25 14:51:18 +01:00
parent 5feb718706
commit 8076c1d094
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
poezio/windows/image.py
View file

@ -12,7 +12,7 @@ except ImportError:
HAS_PIL = False HAS_PIL = False
from poezio.windows.base_wins import Win from poezio.windows.base_wins import Win
from poezio.theming import to_curses_attr from poezio.theming import get_theme, to_curses_attr
from poezio.xhtml import _parse_css_color from poezio.xhtml import _parse_css_color
from poezio.config import config from poezio.config import config
@ -37,21 +37,29 @@ class ImageWin(Win):
self._display_avatar(width, height) self._display_avatar(width, height)
def refresh(self, data): def refresh(self, data):
self._win.clear() self._win.erase()
if data is None or not HAS_PIL: if data is not None and HAS_PIL:
self._image = None
self._display_border()
else:
image_file = BytesIO(data) image_file = BytesIO(data)
self._image = Image.open(image_file).convert('RGB') try:
self._display_avatar(self.width, self.height) image = Image.open(image_file)
except OSError:
self._display_border()
else:
self._image = image.convert('RGB')
self._display_avatar(self.width, self.height)
else:
self._display_border()
self._refresh() self._refresh()
def _display_border(self): def _display_border(self):
self._image = None
attribute = to_curses_attr(get_theme().COLOR_VERTICAL_SEPARATOR)
self._win.attron(attribute)
self._win.border(curses.ACS_VLINE, curses.ACS_VLINE, curses.ACS_HLINE, self._win.border(curses.ACS_VLINE, curses.ACS_VLINE, curses.ACS_HLINE,
curses.ACS_HLINE, curses.ACS_ULCORNER, curses.ACS_HLINE, curses.ACS_ULCORNER,
curses.ACS_URCORNER, curses.ACS_LLCORNER, curses.ACS_URCORNER, curses.ACS_LLCORNER,
curses.ACS_LRCORNER) curses.ACS_LRCORNER)
self._win.attroff(attribute)
@staticmethod @staticmethod
def _compute_size(image_size, width: int, height: int): def _compute_size(image_size, width: int, height: int):