mr_tesla/discover-desktop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

- Always blank spot for avatar even if no avatar to draw

Browse source
This commit is contained in:
trigg 2022-07-10 10:18:41 +01:00
parent ee9a80a5f1
commit 248956efca
1 changed files with 20 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

24
discover_overlay/voice_overlay.py
View file

@ -600,6 +600,22 @@ class VoiceOverlayWindow(OverlayWindow):
avatar_size,
self.text_font
)
# Blank out space for avatar
context.save()
context.move_to(pos_x, pos_y)
if self.round_avatar:
context.arc(pos_x + (self.avatar_size / 2), pos_y +
(self.avatar_size / 2), self.avatar_size / 2, 0, 2 * math.pi)
context.clip()
self.col([0.0, 0.0, 0.0, 0.0])
context.set_operator(cairo.OPERATOR_SOURCE)
context.rectangle(pos_x, pos_y, avatar_size, avatar_size)
context.fill()
context.restore()
self.draw_connection_icon(context, pos_x, pos_y, avatar_size)
return tw
@ -720,10 +736,6 @@ class VoiceOverlayWindow(OverlayWindow):
"""
Draw avatar image at given position
"""
if not pixbuf:
pixbuf = self.def_avatar
if not pixbuf:
return
context.move_to(pos_x, pos_y)
context.save()
if self.round_avatar:
@ -735,6 +747,10 @@ class VoiceOverlayWindow(OverlayWindow):
context.set_operator(cairo.OPERATOR_SOURCE)
context.rectangle(pos_x, pos_y, avatar_size, avatar_size)
context.fill()
if not pixbuf:
pixbuf = self.def_avatar
if not pixbuf:
return
draw_img_to_rect(pixbuf, context, pos_x, pos_y,
avatar_size, avatar_size)
context.restore()