diff options
author | simonb <simonb> | 2006-04-21 14:53:25 (GMT) |
---|---|---|
committer | simonb <simonb> | 2006-04-21 14:53:25 (GMT) |
commit | a8b9672792908ca6f3a05a6060ce9927adb878b1 (patch) | |
tree | c8c9cc4a613ffe8dd92baf6c4cb89f7dd857b2f4 | |
parent | 87b691747cb6c109b984f3d8b5409967a5692e5e (diff) | |
download | fluxbox_lack-a8b9672792908ca6f3a05a6060ce9927adb878b1.zip fluxbox_lack-a8b9672792908ca6f3a05a6060ce9927adb878b1.tar.bz2 |
border between tabs same as window border
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | src/FbWinFrame.cc | 14 |
2 files changed, 15 insertions, 3 deletions
@@ -1,5 +1,9 @@ | |||
1 | (Format: Year/Month/Day) | 1 | (Format: Year/Month/Day) |
2 | Changes for 0.9.16: | 2 | Changes for 0.9.16: |
3 | *06/04/21: | ||
4 | * Make border between tabs same width/color as window border (Simon) | ||
5 | (sf.net #1473870) | ||
6 | FbWinFrame.cc | ||
3 | *06/04/19: | 7 | *06/04/19: |
4 | * Add a bunch of apps to fluxbox-generate_menu, plus a new System | 8 | * Add a bunch of apps to fluxbox-generate_menu, plus a new System |
5 | Tools menu (thanks Ku8aZ at users.sourceforge.net) | 9 | 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 | |||
562 | 562 | ||
563 | button->setTextPadding(tabs_padding); | 563 | button->setTextPadding(tabs_padding); |
564 | button->setJustify(theme().justify()); | 564 | button->setJustify(theme().justify()); |
565 | button->setBorderColor(theme().border().color()); | ||
566 | button->setBorderWidth(m_window.borderWidth()); | ||
565 | 567 | ||
566 | m_tab_container.insertItem(button); | 568 | m_tab_container.insertItem(button); |
567 | 569 | ||
@@ -1514,6 +1516,15 @@ void FbWinFrame::setBorderWidth(unsigned int border_width) { | |||
1514 | gripRight().setBorderWidth(border_width); | 1516 | gripRight().setBorderWidth(border_width); |
1515 | gripRight().setBorderColor(theme().border().color()); | 1517 | gripRight().setBorderColor(theme().border().color()); |
1516 | 1518 | ||
1519 | // and the labelbuttons | ||
1520 | Container::ItemList::iterator btn_it = m_tab_container.begin(); | ||
1521 | Container::ItemList::iterator btn_it_end = m_tab_container.end(); | ||
1522 | for (; btn_it != btn_it_end; ++btn_it) { | ||
1523 | (*btn_it)->setBorderWidth(border_width); | ||
1524 | (*btn_it)->setBorderColor(theme().border().color()); | ||
1525 | } | ||
1526 | m_tab_container.update(); | ||
1527 | |||
1517 | if (bw_changes != 0) | 1528 | if (bw_changes != 0) |
1518 | resize(width(), height() + bw_changes); | 1529 | resize(width(), height() + bw_changes); |
1519 | 1530 | ||
@@ -1523,7 +1534,6 @@ void FbWinFrame::setBorderWidth(unsigned int border_width) { | |||
1523 | 1534 | ||
1524 | void FbWinFrame::applyFocusLabel(FbTk::TextButton &button) { | 1535 | void FbWinFrame::applyFocusLabel(FbTk::TextButton &button) { |
1525 | 1536 | ||
1526 | button.setBorderWidth(1); | ||
1527 | button.setGC(theme().labelTextFocusGC()); | 1537 | button.setGC(theme().labelTextFocusGC()); |
1528 | button.setJustify(theme().justify()); | 1538 | button.setJustify(theme().justify()); |
1529 | button.setAlpha(m_focused?theme().focusedAlpha():theme().unfocusedAlpha()); | 1539 | button.setAlpha(m_focused?theme().focusedAlpha():theme().unfocusedAlpha()); |
@@ -1537,7 +1547,6 @@ void FbWinFrame::applyFocusLabel(FbTk::TextButton &button) { | |||
1537 | 1547 | ||
1538 | void FbWinFrame::applyActiveLabel(FbTk::TextButton &button) { | 1548 | void FbWinFrame::applyActiveLabel(FbTk::TextButton &button) { |
1539 | 1549 | ||
1540 | button.setBorderWidth(1); | ||
1541 | button.setGC(theme().labelTextActiveGC()); | 1550 | button.setGC(theme().labelTextActiveGC()); |
1542 | button.setJustify(theme().justify()); | 1551 | button.setJustify(theme().justify()); |
1543 | button.setAlpha(m_focused?theme().focusedAlpha():theme().unfocusedAlpha()); | 1552 | button.setAlpha(m_focused?theme().focusedAlpha():theme().unfocusedAlpha()); |
@@ -1553,7 +1562,6 @@ void FbWinFrame::applyUnfocusLabel(FbTk::TextButton &button) { | |||
1553 | 1562 | ||
1554 | button.setGC(theme().labelTextUnfocusGC()); | 1563 | button.setGC(theme().labelTextUnfocusGC()); |
1555 | button.setJustify(theme().justify()); | 1564 | button.setJustify(theme().justify()); |
1556 | button.setBorderWidth(1); | ||
1557 | button.setAlpha(m_focused?theme().focusedAlpha():theme().unfocusedAlpha()); | 1565 | button.setAlpha(m_focused?theme().focusedAlpha():theme().unfocusedAlpha()); |
1558 | 1566 | ||
1559 | if (m_labelbutton_unfocused_pm != 0) { | 1567 | if (m_labelbutton_unfocused_pm != 0) { |