[core] Calculate minwidth including pre/suffix
Add the length of the prefix and suffix to the minimum width, if applicable.
This commit is contained in:
parent
434473c875
commit
1a82a717fa
1 changed files with 4 additions and 1 deletions
|
@ -70,10 +70,13 @@ class I3BarOutput(object):
|
||||||
padding = self._theme.padding(widget)
|
padding = self._theme.padding(widget)
|
||||||
prefix = self._theme.prefix(widget, padding)
|
prefix = self._theme.prefix(widget, padding)
|
||||||
suffix = self._theme.suffix(widget, padding)
|
suffix = self._theme.suffix(widget, padding)
|
||||||
|
minwidth = self._theme.minwidth(widget)
|
||||||
if prefix:
|
if prefix:
|
||||||
full_text = u"{}{}".format(prefix, full_text)
|
full_text = u"{}{}".format(prefix, full_text)
|
||||||
|
if minwidth: minwidth += "A"*len(prefix)
|
||||||
if suffix:
|
if suffix:
|
||||||
full_text = u"{}{}".format(full_text, suffix)
|
full_text = u"{}{}".format(full_text, suffix)
|
||||||
|
if minwidth: minwidth += "A"*len(suffix)
|
||||||
separator = self._theme.separator(widget)
|
separator = self._theme.separator(widget)
|
||||||
if separator:
|
if separator:
|
||||||
self._widgets.append({
|
self._widgets.append({
|
||||||
|
@ -89,7 +92,7 @@ class I3BarOutput(object):
|
||||||
"background": self._theme.bg(widget),
|
"background": self._theme.bg(widget),
|
||||||
"separator_block_width": self._theme.separator_block_width(widget),
|
"separator_block_width": self._theme.separator_block_width(widget),
|
||||||
"separator": True if separator is None else False,
|
"separator": True if separator is None else False,
|
||||||
"min_width": self._theme.minwidth(widget),
|
"min_width": minwidth,
|
||||||
"align": self._theme.align(widget),
|
"align": self._theme.align(widget),
|
||||||
"instance": widget.id,
|
"instance": widget.id,
|
||||||
"name": module.id,
|
"name": module.id,
|
||||||
|
|
Loading…
Reference in a new issue