2 files changed, 15 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 45ed7de..e912106 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 (Format: Year/Month/Day)
 Changes for 0.9.16:
+*06/04/21:
+   * Make border between tabs same width/color as window border (Simon)
+     (sf.net #1473870)
+     FbWinFrame.cc
 *06/04/19:
    * Add a bunch of apps to fluxbox-generate_menu, plus a new System 
      Tools menu (thanks Ku8aZ at users.sourceforge.net)
diff --git a/src/FbWinFrame.cc b/src/FbWinFrame.cc
index a72b679..8982d02 100644
--- a/src/FbWinFrame.cc
+++ b/src/FbWinFrame.cc
@@ -562,6 +562,8 @@ FbWinFrame::ButtonId FbWinFrame::createTab(const std::string &title, FbTk::Comma
 
     button->setTextPadding(tabs_padding);
     button->setJustify(theme().justify());
+    button->setBorderColor(theme().border().color());
+    button->setBorderWidth(m_window.borderWidth());
 
     m_tab_container.insertItem(button);
 
@@ -1514,6 +1516,15 @@ void FbWinFrame::setBorderWidth(unsigned int border_width) {
     gripRight().setBorderWidth(border_width);
     gripRight().setBorderColor(theme().border().color());
 
+    // and the labelbuttons
+    Container::ItemList::iterator btn_it = m_tab_container.begin();
+    Container::ItemList::iterator btn_it_end = m_tab_container.end();
+    for (; btn_it != btn_it_end; ++btn_it) {
+        (*btn_it)->setBorderWidth(border_width);
+        (*btn_it)->setBorderColor(theme().border().color());
+    }
+    m_tab_container.update();
+
     if (bw_changes != 0)
         resize(width(), height() + bw_changes);
 
@@ -1523,7 +1534,6 @@ void FbWinFrame::setBorderWidth(unsigned int border_width) {
 
 void FbWinFrame::applyFocusLabel(FbTk::TextButton &button) {
 
-    button.setBorderWidth(1);
     button.setGC(theme().labelTextFocusGC());
     button.setJustify(theme().justify());
     button.setAlpha(m_focused?theme().focusedAlpha():theme().unfocusedAlpha());
@@ -1537,7 +1547,6 @@ void FbWinFrame::applyFocusLabel(FbTk::TextButton &button) {
 
 void FbWinFrame::applyActiveLabel(FbTk::TextButton &button) {
 
-    button.setBorderWidth(1);
     button.setGC(theme().labelTextActiveGC());
     button.setJustify(theme().justify());
     button.setAlpha(m_focused?theme().focusedAlpha():theme().unfocusedAlpha());
@@ -1553,7 +1562,6 @@ void FbWinFrame::applyUnfocusLabel(FbTk::TextButton &button) {
 
     button.setGC(theme().labelTextUnfocusGC());
     button.setJustify(theme().justify());
-    button.setBorderWidth(1);
     button.setAlpha(m_focused?theme().focusedAlpha():theme().unfocusedAlpha());
 
     if (m_labelbutton_unfocused_pm != 0) {