parent
302296ee03
commit
a7d22edcda
1 changed files with 6 additions and 4 deletions
|
@ -397,6 +397,7 @@ class WidgetDrawer(object):
|
||||||
|
|
||||||
if self._prefix:
|
if self._prefix:
|
||||||
self._full_text = u"{}{}".format(self._prefix, self._full_text)
|
self._full_text = u"{}{}".format(self._prefix, self._full_text)
|
||||||
|
return self._prefix
|
||||||
|
|
||||||
def add_suffix_iconmarkup(self, widget):
|
def add_suffix_iconmarkup(self, widget):
|
||||||
"""add custom Pango markup for suffix"""
|
"""add custom Pango markup for suffix"""
|
||||||
|
@ -412,6 +413,7 @@ class WidgetDrawer(object):
|
||||||
|
|
||||||
if self._suffix:
|
if self._suffix:
|
||||||
self._full_text = u"{}{}".format(self._full_text, self._suffix)
|
self._full_text = u"{}{}".format(self._full_text, self._suffix)
|
||||||
|
return self._suffix
|
||||||
|
|
||||||
def escape_amp(self):
|
def escape_amp(self):
|
||||||
"""escape & in full_text, because pango requires it"""
|
"""escape & in full_text, because pango requires it"""
|
||||||
|
@ -441,10 +443,8 @@ class WidgetDrawer(object):
|
||||||
raw = self._full_text
|
raw = self._full_text
|
||||||
|
|
||||||
padding = self._theme.padding(widget)
|
padding = self._theme.padding(widget)
|
||||||
|
prefix = self.add_prefix(widget, padding)
|
||||||
self.add_prefix(widget, padding)
|
suffix = self.add_suffix(widget, padding)
|
||||||
|
|
||||||
self.add_suffix(widget, padding)
|
|
||||||
|
|
||||||
width = self._theme.minwidth(widget)
|
width = self._theme.minwidth(widget)
|
||||||
|
|
||||||
|
@ -466,6 +466,8 @@ class WidgetDrawer(object):
|
||||||
"name": module.id,
|
"name": module.id,
|
||||||
"markup": self._markup,
|
"markup": self._markup,
|
||||||
"_raw": raw,
|
"_raw": raw,
|
||||||
|
"_prefix": prefix,
|
||||||
|
"_suffix": suffix,
|
||||||
})
|
})
|
||||||
return self._widgets
|
return self._widgets
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue