diff options
author | Mark Tiefenbruck <mark@fluxbox.org> | 2008-05-16 08:13:45 (GMT) |
---|---|---|
committer | Mark Tiefenbruck <mark@fluxbox.org> | 2008-05-16 08:13:45 (GMT) |
commit | 855ff278aff6c0903eb6177c017d9936d2dd82ee (patch) | |
tree | 794e5e95e1432a88807df8d31ded43eebf89cd98 | |
parent | 2815393751463b7d35ee5838d96a16ab74adf414 (diff) | |
download | fluxbox_paul-855ff278aff6c0903eb6177c017d9936d2dd82ee.zip fluxbox_paul-855ff278aff6c0903eb6177c017d9936d2dd82ee.tar.bz2 |
move some code around
-rw-r--r-- | src/FbWinFrame.cc | 9 | ||||
-rw-r--r-- | src/Window.cc | 7 |
2 files changed, 7 insertions, 9 deletions
diff --git a/src/FbWinFrame.cc b/src/FbWinFrame.cc index 234364e..a806888 100644 --- a/src/FbWinFrame.cc +++ b/src/FbWinFrame.cc | |||
@@ -871,8 +871,13 @@ void FbWinFrame::reconfigure() { | |||
871 | gravityTranslate(grav_x, grav_y, -m_active_gravity, m_active_orig_client_bw, false); | 871 | gravityTranslate(grav_x, grav_y, -m_active_gravity, m_active_orig_client_bw, false); |
872 | 872 | ||
873 | m_bevel = theme()->bevelWidth(); | 873 | m_bevel = theme()->bevelWidth(); |
874 | // reconfigure can't set borderwidth, as it doesn't know | 874 | setBorderWidth(m_decoration_mask & DECORM_BORDER ? |
875 | // if it's meant to be borderless or not | 875 | theme()->border().width() : 0); |
876 | |||
877 | if (m_decoration_mask & DECORM_HANDLE && theme()->handleWidth() != 0) | ||
878 | showHandle(); | ||
879 | else | ||
880 | hideHandle(); | ||
876 | 881 | ||
877 | unsigned int orig_handle_h = handle().height(); | 882 | unsigned int orig_handle_h = handle().height(); |
878 | if (m_use_handle && orig_handle_h != theme()->handleWidth()) | 883 | if (m_use_handle && orig_handle_h != theme()->handleWidth()) |
diff --git a/src/Window.cc b/src/Window.cc index a7b2331..8ad1762 100644 --- a/src/Window.cc +++ b/src/Window.cc | |||
@@ -4077,13 +4077,6 @@ void FluxboxWindow::updateButtons() { | |||
4077 | */ | 4077 | */ |
4078 | void FluxboxWindow::reconfigTheme() { | 4078 | void FluxboxWindow::reconfigTheme() { |
4079 | 4079 | ||
4080 | m_frame.setBorderWidth(decorations.border ? | ||
4081 | frame().theme()->border().width() : 0); | ||
4082 | if (decorations.handle && frame().theme()->handleWidth() != 0) | ||
4083 | frame().showHandle(); | ||
4084 | else | ||
4085 | frame().hideHandle(); | ||
4086 | |||
4087 | ClientList::iterator it = clientList().begin(); | 4080 | ClientList::iterator it = clientList().begin(); |
4088 | ClientList::iterator it_end = clientList().end(); | 4081 | ClientList::iterator it_end = clientList().end(); |
4089 | 4082 | ||