remove some unnecessary code

This commit is contained in:
Mark Tiefenbruck 2008-01-03 19:37:21 -08:00
parent 9c105111d2
commit b20b243b48
4 changed files with 4 additions and 25 deletions

View file

@ -90,10 +90,8 @@ FbWinFrame::FbWinFrame(BScreen &screen, FbWinFrameTheme &theme, FbTk::ImageContr
m_shaded(false), m_shaded(false),
m_focused_alpha(AlphaAcc(theme, &FbWinFrameTheme::focusedAlpha)), m_focused_alpha(AlphaAcc(theme, &FbWinFrameTheme::focusedAlpha)),
m_unfocused_alpha(AlphaAcc(theme, &FbWinFrameTheme::unfocusedAlpha)), m_unfocused_alpha(AlphaAcc(theme, &FbWinFrameTheme::unfocusedAlpha)),
m_themelistener(*this),
m_shape(m_window, theme.shapePlace()), m_shape(m_window, theme.shapePlace()),
m_disable_themeshape(false) { m_disable_themeshape(false) {
m_theme.reconfigSig().attach(&m_themelistener);
init(); init();
} }

View file

@ -396,16 +396,6 @@ private:
FbTk::DefaultValue<unsigned char, AlphaAcc> m_focused_alpha; FbTk::DefaultValue<unsigned char, AlphaAcc> m_focused_alpha;
FbTk::DefaultValue<unsigned char, AlphaAcc> m_unfocused_alpha; FbTk::DefaultValue<unsigned char, AlphaAcc> m_unfocused_alpha;
class ThemeListener: public FbTk::Observer {
public:
ThemeListener(FbWinFrame &frame):m_frame(frame) { }
void update(FbTk::Subject *) {
m_frame.reconfigure();
}
private:
FbWinFrame &m_frame;
};
ThemeListener m_themelistener;
FbTk::Shape m_shape; FbTk::Shape m_shape;
bool m_disable_themeshape; bool m_disable_themeshape;

View file

@ -269,7 +269,6 @@ FluxboxWindow::FluxboxWindow(WinClient &client, FbWinFrameTheme &tm,
m_statesig(*this), m_statesig(*this),
m_layersig(*this), m_layersig(*this),
m_workspacesig(*this), m_workspacesig(*this),
m_themelistener(*this),
m_creation_time(0), m_creation_time(0),
moving(false), resizing(false), shaded(false), iconic(false), moving(false), resizing(false), shaded(false), iconic(false),
stuck(false), m_initialized(false), fullscreen(false), stuck(false), m_initialized(false), fullscreen(false),
@ -299,7 +298,7 @@ FluxboxWindow::FluxboxWindow(WinClient &client, FbWinFrameTheme &tm,
m_parent(client.screen().rootWindow()), m_parent(client.screen().rootWindow()),
m_resize_corner(RIGHTBOTTOM) { m_resize_corner(RIGHTBOTTOM) {
tm.reconfigSig().attach(&m_themelistener); tm.reconfigSig().attach(this);
init(); init();
@ -3011,6 +3010,9 @@ void FluxboxWindow::update(FbTk::Subject *subj) {
if (FocusControl::focusedFbWindow()) if (FocusControl::focusedFbWindow())
setFullscreenLayer(); setFullscreenLayer();
} }
} else if (subj == &frame().theme().reconfigSig()) {
reconfigTheme();
frame().reconfigure();
} }
} }

View file

@ -556,17 +556,6 @@ private:
m_layersig, m_layersig,
m_workspacesig; m_workspacesig;
class ThemeListener: public FbTk::Observer {
public:
ThemeListener(FluxboxWindow &win):m_win(win) { }
void update(FbTk::Subject *) {
m_win.reconfigTheme();
}
private:
FluxboxWindow &m_win;
};
ThemeListener m_themelistener;
time_t m_creation_time; time_t m_creation_time;
// Window states // Window states