fix external tab bg when label bg is parentrelative

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 @@
 (Format: Year/Month/Day)
 Changes for 0.9.16:
 *06/05/21:
+   * Fix background of external tabs when label background is 
+     ParentRelative (Simon)
+     FbWinFrame.cc
    * Improve native language support handling, especially relating
      to codesets (Simon)
      *** 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() {
         return;
     }
 
-    render(m_theme.labelFocusTexture(), m_tabcontainer_focused_color, 
+    const FbTk::Texture *tc_focused = &m_theme.labelFocusTexture();
+    const FbTk::Texture *tc_unfocused = &m_theme.labelUnfocusTexture();
+
+    if (m_tabmode == EXTERNAL && tc_focused->type() & FbTk::Texture::PARENTRELATIVE)
+        tc_focused = &m_theme.titleFocusTexture();
+    if (m_tabmode == EXTERNAL && tc_unfocused->type() & FbTk::Texture::PARENTRELATIVE)
+        tc_unfocused = &m_theme.titleUnfocusTexture();
+
+    render(*tc_focused, m_tabcontainer_focused_color, 
            m_tabcontainer_focused_pm,
            m_tab_container.width(), m_tab_container.height(), m_tab_container.orientation());
 
-    render(m_theme.labelUnfocusTexture(), m_tabcontainer_unfocused_color, 
+    render(*tc_unfocused, m_tabcontainer_unfocused_color, 
            m_tabcontainer_unfocused_pm,
            m_tab_container.width(), m_tab_container.height(), m_tab_container.orientation());