summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsimonb <simonb>2006-05-20 16:27:25 (GMT)
committersimonb <simonb>2006-05-20 16:27:25 (GMT)
commitf564d3c4cf6309d3b6d66f2139185434e7815cac (patch)
tree46be34c05783b8713238991a412c229530b813ea
parentff463a0481d17208637b95effe3b4159b25c5121 (diff)
downloadfluxbox_lack-f564d3c4cf6309d3b6d66f2139185434e7815cac.zip
fluxbox_lack-f564d3c4cf6309d3b6d66f2139185434e7815cac.tar.bz2
fix external tab bg when label bg is parentrelative
-rw-r--r--ChangeLog3
-rw-r--r--src/FbWinFrame.cc12
2 files changed, 13 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 568bc21..976981d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
1(Format: Year/Month/Day) 1(Format: Year/Month/Day)
2Changes for 0.9.16: 2Changes for 0.9.16:
3*06/05/21: 3*06/05/21:
4 * Fix background of external tabs when label background is
5 ParentRelative (Simon)
6 FbWinFrame.cc
4 * Improve native language support handling, especially relating 7 * Improve native language support handling, especially relating
5 to codesets (Simon) 8 to codesets (Simon)
6 *** Please report any oddness (Esp regressions) in native text 9 *** Please report any oddness (Esp regressions) in native text
diff --git a/src/FbWinFrame.cc b/src/FbWinFrame.cc
index 8982d02..d3dd682 100644
--- a/src/FbWinFrame.cc
+++ b/src/FbWinFrame.cc
@@ -1182,11 +1182,19 @@ void FbWinFrame::renderTabContainer() {
1182 return; 1182 return;
1183 } 1183 }
1184 1184
1185 render(m_theme.labelFocusTexture(), m_tabcontainer_focused_color, 1185 const FbTk::Texture *tc_focused = &m_theme.labelFocusTexture();
1186 const FbTk::Texture *tc_unfocused = &m_theme.labelUnfocusTexture();
1187
1188 if (m_tabmode == EXTERNAL && tc_focused->type() & FbTk::Texture::PARENTRELATIVE)
1189 tc_focused = &m_theme.titleFocusTexture();
1190 if (m_tabmode == EXTERNAL && tc_unfocused->type() & FbTk::Texture::PARENTRELATIVE)
1191 tc_unfocused = &m_theme.titleUnfocusTexture();
1192
1193 render(*tc_focused, m_tabcontainer_focused_color,
1186 m_tabcontainer_focused_pm, 1194 m_tabcontainer_focused_pm,
1187 m_tab_container.width(), m_tab_container.height(), m_tab_container.orientation()); 1195 m_tab_container.width(), m_tab_container.height(), m_tab_container.orientation());
1188 1196
1189 render(m_theme.labelUnfocusTexture(), m_tabcontainer_unfocused_color, 1197 render(*tc_unfocused, m_tabcontainer_unfocused_color,
1190 m_tabcontainer_unfocused_pm, 1198 m_tabcontainer_unfocused_pm,
1191 m_tab_container.width(), m_tab_container.height(), m_tab_container.orientation()); 1199 m_tab_container.width(), m_tab_container.height(), m_tab_container.orientation());
1192 1200