diff options
| author | Mark Tiefenbruck <mark@fluxbox.org> | 2008-08-27 22:29:33 (GMT) |
|---|---|---|
| committer | Mark Tiefenbruck <mark@fluxbox.org> | 2008-08-27 22:29:33 (GMT) |
| commit | 82047e6a391a12be9583168f28ac72c1154108d6 (patch) | |
| tree | 68cc4865da7bdf95052907c6d8ce9cf0fb19c90b /src/FbWinFrame.cc | |
| parent | a2ec0c9bdd9ebcc713426a79209b9ca90b4db301 (diff) | |
| download | fluxbox-82047e6a391a12be9583168f28ac72c1154108d6.zip fluxbox-82047e6a391a12be9583168f28ac72c1154108d6.tar.bz2 | |
move some things from FluxboxWindow to WindowState
Diffstat (limited to 'src/FbWinFrame.cc')
| -rw-r--r-- | src/FbWinFrame.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/FbWinFrame.cc b/src/FbWinFrame.cc index 0fa71d5..8617c1b 100644 --- a/src/FbWinFrame.cc +++ b/src/FbWinFrame.cc | |||
| @@ -41,9 +41,8 @@ | |||
| 41 | using std::mem_fun; | 41 | using std::mem_fun; |
| 42 | using std::string; | 42 | using std::string; |
| 43 | 43 | ||
| 44 | FbWinFrame::FbWinFrame(BScreen &screen, | 44 | FbWinFrame::FbWinFrame(BScreen &screen, WindowState &state, |
| 45 | FocusableTheme<FbWinFrameTheme> &theme, | 45 | FocusableTheme<FbWinFrameTheme> &theme): |
| 46 | FbTk::XLayer &layer, WindowState &state): | ||
| 47 | m_screen(screen), | 46 | m_screen(screen), |
| 48 | m_theme(theme), | 47 | m_theme(theme), |
| 49 | m_imagectrl(screen.imageControl()), | 48 | m_imagectrl(screen.imageControl()), |
| @@ -52,7 +51,7 @@ FbWinFrame::FbWinFrame(BScreen &screen, | |||
| 52 | ButtonPressMask | ButtonReleaseMask | | 51 | ButtonPressMask | ButtonReleaseMask | |
| 53 | ButtonMotionMask | EnterWindowMask | | 52 | ButtonMotionMask | EnterWindowMask | |
| 54 | LeaveWindowMask, true), | 53 | LeaveWindowMask, true), |
| 55 | m_layeritem(window(), layer), | 54 | m_layeritem(window(), *screen.layerManager().getLayer(Layer::NORMAL)), |
| 56 | m_titlebar(m_window, 0, 0, 100, 16, | 55 | m_titlebar(m_window, 0, 0, 100, 16, |
| 57 | ButtonPressMask | ButtonReleaseMask | | 56 | ButtonPressMask | ButtonReleaseMask | |
| 58 | ButtonMotionMask | ExposureMask | | 57 | ButtonMotionMask | ExposureMask | |