aboutsummaryrefslogtreecommitdiff
path: root/src/FbWinFrame.cc
diff options
context:
space:
mode:
authorThomas Lübking <thomas.luebking@gmail.com>2016-06-25 20:25:48 (GMT)
committerMathias Gumz <akira@fluxbox.org>2016-06-26 14:29:34 (GMT)
commitdcdde4d32c93d01df205bc06d7dfcbd356be031f (patch)
treecc44a58c3e1bbe25e94e969757b8eedb89ca67da /src/FbWinFrame.cc
parent484c33bf25a37952a91123fb728e4b983e70f531 (diff)
downloadfluxbox-dcdde4d32c93d01df205bc06d7dfcbd356be031f.zip
fluxbox-dcdde4d32c93d01df205bc06d7dfcbd356be031f.tar.bz2
replace FbRootWindow::depth with maxDepth
The depth member of FbWindow was abused to store the maximum depth but that gets overridden with geometry changes of the root window (screen layout changes) so we store and read the value explicitly while ::depth() maintains the actual depth of the root window The result of this is that frames for ARGB windows were created with a wrong depth and failed to reparent the client window. BUG: 1102 BUG: 1058
Diffstat (limited to 'src/FbWinFrame.cc')
-rw-r--r--src/FbWinFrame.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/FbWinFrame.cc b/src/FbWinFrame.cc
index 48d6e87..42b81e7 100644
--- a/src/FbWinFrame.cc
+++ b/src/FbWinFrame.cc
@@ -115,8 +115,8 @@ FbWinFrame::FbWinFrame(BScreen &screen, unsigned int client_depth,
115 m_state(state), 115 m_state(state),
116 m_window(theme->screenNum(), state.x, state.y, state.width, state.height, s_mask, true, false, 116 m_window(theme->screenNum(), state.x, state.y, state.width, state.height, s_mask, true, false,
117 client_depth, InputOutput, 117 client_depth, InputOutput,
118 ((client_depth == 32) && (screen.rootWindow().depth() == 32) ? screen.rootWindow().visual() : CopyFromParent), 118 (client_depth == screen.rootWindow().maxDepth() ? screen.rootWindow().visual() : CopyFromParent),
119 ((client_depth == 32) && (screen.rootWindow().depth() == 32) ? screen.rootWindow().colormap() : CopyFromParent)), 119 (client_depth == screen.rootWindow().maxDepth() ? screen.rootWindow().colormap() : CopyFromParent)),
120 m_layeritem(window(), *screen.layerManager().getLayer(ResourceLayer::NORMAL)), 120 m_layeritem(window(), *screen.layerManager().getLayer(ResourceLayer::NORMAL)),
121 m_titlebar(m_window, 0, 0, 100, 16, s_mask, false, false, 121 m_titlebar(m_window, 0, 0, 100, 16, s_mask, false, false,
122 screen.rootWindow().decorationDepth(), InputOutput, 122 screen.rootWindow().decorationDepth(), InputOutput,