l.behm/bumblebee-status
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

make markup an instance variable

Browse source 
it will be used in more than one method
This commit is contained in:
me 2020-01-31 12:00:15 +02:00
parent ea1c0b7043
commit 1f0f1c1722
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
bumblebee/output.py
View file

@ -334,6 +334,7 @@ class WidgetDrawer(object):
self._theme = theme self._theme = theme
self._config = config self._config = config
self._widgets = [] self._widgets = []
self._markup = None
self._prefix = None self._prefix = None
self._suffix = None self._suffix = None
@ -365,14 +366,14 @@ class WidgetDrawer(object):
separator = self._theme.separator(widget) separator = self._theme.separator(widget)
self.add_separator(widget, separator) self.add_separator(widget, separator)
markup = "none" if not self._config else self._config.markup() self._markup = "none" if not self._config else self._config.markup()
padding = self._theme.padding(widget) padding = self._theme.padding(widget)
self._prefix = self._theme.prefix(widget, padding) self._prefix = self._theme.prefix(widget, padding)
self._suffix = self._theme.suffix(widget, padding) self._suffix = self._theme.suffix(widget, padding)
if markup == "pango": if self._markup == "pango":
# add prefix/suffix colors # add prefix/suffix colors
fg = self._theme.prefix_fg(widget) fg = self._theme.prefix_fg(widget)
bg = self._theme.prefix_bg(widget) bg = self._theme.prefix_bg(widget)
@ -394,7 +395,7 @@ class WidgetDrawer(object):
if width: if width:
full_text = full_text.ljust(len(width) + len(self._prefix) + len(self._suffix)) full_text = full_text.ljust(len(width) + len(self._prefix) + len(self._suffix))
if markup == "pango": if self._markup == "pango":
full_text = full_text.replace("&", "&") full_text = full_text.replace("&", "&")
self._widgets.append({ self._widgets.append({
@ -408,7 +409,7 @@ class WidgetDrawer(object):
"align": self._theme.align(widget), "align": self._theme.align(widget),
"instance": widget.id, "instance": widget.id,
"name": module.id, "name": module.id,
"markup": markup, "markup": self._markup,
}) })
return self._widgets return self._widgets