Commit ed5f7b18 authored by Link Mauve's avatar Link Mauve

Remove the global Win._win_core, instead pass core to the two *GlobalInfoBar.

parent b08688c7
......@@ -86,7 +86,7 @@ class Core(object):
self.information_buffer.add_window(self.information_win)
self.left_tab_win = None
self.tab_win = windows.GlobalInfoBar()
self.tab_win = windows.GlobalInfoBar(self)
# Whether the XML tab is opened
self.xml_tab = None
self.xml_buffer = TextBuffer()
......@@ -1641,7 +1641,7 @@ class Core(object):
except:
log.error('Curses error on infobar resize', exc_info=True)
return
self.left_tab_win = windows.VerticalGlobalInfoBar(truncated_win)
self.left_tab_win = windows.VerticalGlobalInfoBar(self, truncated_win)
elif not self.size.core_degrade_y:
self.tab_win.resize(1, tabs.Tab.width,
tabs.Tab.height - 2, 0)
......
......@@ -34,7 +34,6 @@ class DummyWin(object):
return False
class Win(object):
_win_core = None
_tab_win = None
def __init__(self):
self._win = None
......@@ -149,10 +148,3 @@ class Win(object):
self.addnstr(' '*size, size, to_curses_attr(color))
else:
self.addnstr(' '*size, size)
@property
def core(self):
if not Win._win_core:
Win._win_core = singleton.Singleton(core.Core)
return Win._win_core
......@@ -16,8 +16,9 @@ from . import Win
from theming import get_theme, to_curses_attr
class GlobalInfoBar(Win):
def __init__(self):
def __init__(self, core):
Win.__init__(self)
self.core = core
def refresh(self):
log.debug('Refresh: %s', self.__class__.__name__)
......@@ -62,8 +63,9 @@ class GlobalInfoBar(Win):
self._refresh()
class VerticalGlobalInfoBar(Win):
def __init__(self, scr):
def __init__(self, core, scr):
Win.__init__(self)
self.core = core
self._win = scr
def refresh(self):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment