summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-08-25 17:07:32 (GMT)
committerfluxgen <fluxgen>2003-08-25 17:07:32 (GMT)
commitb947855ca5ddf4db72b83ee43112c95f3c8b95ca (patch)
tree10870ee599df29e122b169f4c25afef9070250a7 /src
parent2e97e2ccf1d5759dec81e26d7e22c47c6436cbff (diff)
downloadfluxbox_lack-b947855ca5ddf4db72b83ee43112c95f3c8b95ca.zip
fluxbox_lack-b947855ca5ddf4db72b83ee43112c95f3c8b95ca.tar.bz2
moved border color and width to frame theme
Diffstat (limited to 'src')
-rw-r--r--src/Window.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Window.cc b/src/Window.cc
index 1d2423d..11fe5c5 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Window.cc,v 1.221 2003/08/24 15:14:41 fluxgen Exp $ 25// $Id: Window.cc,v 1.222 2003/08/25 17:07:32 fluxgen Exp $
26 26
27#include "Window.hh" 27#include "Window.hh"
28 28
@@ -2695,12 +2695,12 @@ void FluxboxWindow::setDecoration(Decoration decoration) {
2695void FluxboxWindow::applyDecorations(bool initial) { 2695void FluxboxWindow::applyDecorations(bool initial) {
2696 frame().clientArea().setBorderWidth(0); // client area bordered by other things 2696 frame().clientArea().setBorderWidth(0); // client area bordered by other things
2697 2697
2698 unsigned int borderW = 0; 2698 unsigned int border_width = 0;
2699 if (decorations.border) 2699 if (decorations.border)
2700 borderW = screen().rootTheme().borderWidth(); 2700 border_width = frame().theme().border().width();
2701 2701
2702 if (initial || frame().window().borderWidth() != borderW) 2702 if (initial || frame().window().borderWidth() != border_width)
2703 frame().setBorderWidth(borderW); 2703 frame().setBorderWidth(border_width);
2704 2704
2705 // we rely on frame not doing anything if it is already shown/hidden 2705 // we rely on frame not doing anything if it is already shown/hidden
2706 if (decorations.titlebar) 2706 if (decorations.titlebar)