aboutsummaryrefslogtreecommitdiff
path: root/src/Window.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/Window.cc')
-rw-r--r--src/Window.cc20
1 files changed, 11 insertions, 9 deletions
diff --git a/src/Window.cc b/src/Window.cc
index 5c6043d..250109e 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -261,8 +261,7 @@ private:
261 261
262int FluxboxWindow::s_num_grabs = 0; 262int FluxboxWindow::s_num_grabs = 0;
263 263
264FluxboxWindow::FluxboxWindow(WinClient &client, 264FluxboxWindow::FluxboxWindow(WinClient &client, FbTk::XLayer &layer):
265 FbTk::ThemeProxy<FbWinFrameTheme> &tm, FbTk::XLayer &layer):
266 Focusable(client.screen(), this), 265 Focusable(client.screen(), this),
267 oplock(false), 266 oplock(false),
268 m_hintsig(*this), 267 m_hintsig(*this),
@@ -291,14 +290,18 @@ FluxboxWindow::FluxboxWindow(WinClient &client,
291 m_old_pos_x(0), m_old_pos_y(0), 290 m_old_pos_x(0), m_old_pos_y(0),
292 m_old_width(1), m_old_height(1), 291 m_old_width(1), m_old_height(1),
293 m_last_button_x(0), m_last_button_y(0), 292 m_last_button_x(0), m_last_button_y(0),
294 m_frame(client.screen(), tm, client.screen().imageControl(), layer, 0, 0, 100, 100), 293 m_theme(*this, screen().focusedWinFrameTheme(),
294 screen().unfocusedWinFrameTheme()),
295 m_frame(client.screen(), m_theme, client.screen().imageControl(), layer,
296 0, 0, 100, 100),
295 m_placed(false), 297 m_placed(false),
296 m_layernum(layer.getLayerNum()), 298 m_layernum(layer.getLayerNum()),
297 m_old_layernum(0), 299 m_old_layernum(0),
298 m_parent(client.screen().rootWindow()), 300 m_parent(client.screen().rootWindow()),
299 m_resize_corner(RIGHTBOTTOM) { 301 m_resize_corner(RIGHTBOTTOM) {
300 302
301 tm.reconfigSig().attach(this); 303 screen().focusedWinFrameTheme().reconfigSig().attach(this);
304 screen().unfocusedWinFrameTheme().reconfigSig().attach(this);
302 305
303 init(); 306 init();
304 307
@@ -3022,7 +3025,7 @@ void FluxboxWindow::applyDecorations(bool initial) {
3022 3025
3023 unsigned int border_width = 0; 3026 unsigned int border_width = 0;
3024 if (decorations.border) 3027 if (decorations.border)
3025 border_width = frame().theme()->border(m_focused).width(); 3028 border_width = frame().theme()->border().width();
3026 3029
3027 bool client_move = false; 3030 bool client_move = false;
3028 3031
@@ -4073,7 +4076,7 @@ void FluxboxWindow::updateButtons() {
4073void FluxboxWindow::reconfigTheme() { 4076void FluxboxWindow::reconfigTheme() {
4074 4077
4075 m_frame.setBorderWidth(decorations.border ? 4078 m_frame.setBorderWidth(decorations.border ?
4076 frame().theme()->border(m_focused).width() : 0); 4079 frame().theme()->border().width() : 0);
4077 if (decorations.handle && frame().theme()->handleWidth() != 0) 4080 if (decorations.handle && frame().theme()->handleWidth() != 0)
4078 frame().showHandle(); 4081 frame().showHandle();
4079 else 4082 else
@@ -4129,9 +4132,8 @@ void FluxboxWindow::ungrabPointer(Time time) {
4129 4132
4130void FluxboxWindow::associateClient(WinClient &client) { 4133void FluxboxWindow::associateClient(WinClient &client) {
4131 IconButton *btn = new IconButton(frame().tabcontainer(), 4134 IconButton *btn = new IconButton(frame().tabcontainer(),
4132 frame().theme()->focusedIconbarTheme(), 4135 frame().theme().focusedTheme()->iconbarTheme(),
4133 frame().theme()->unfocusedIconbarTheme(), 4136 frame().theme().unfocusedTheme()->iconbarTheme(), client);
4134 client);
4135 frame().createTab(*btn); 4137 frame().createTab(*btn);
4136 4138
4137 FbTk::RefCount<FbTk::Command> setcmd(new SetClientCmd(client)); 4139 FbTk::RefCount<FbTk::Command> setcmd(new SetClientCmd(client));