diff options
author | simonb <simonb> | 2006-06-25 14:59:34 (GMT) |
---|---|---|
committer | simonb <simonb> | 2006-06-25 14:59:34 (GMT) |
commit | bf9b60833f87a8b328d71dac5879bdf7a0300d6e (patch) | |
tree | d7316e26c2595fe1eb4c3ebb88d587421e789e87 /src/FbWinFrame.cc | |
parent | 131d04cf423b36bcfeba351eecc520b94586f729 (diff) | |
download | fluxbox-bf9b60833f87a8b328d71dac5879bdf7a0300d6e.zip fluxbox-bf9b60833f87a8b328d71dac5879bdf7a0300d6e.tar.bz2 |
fix FbPixmap retaining pixmap (that made cache not work properly)
Also small tidy in FbWinFrame.cc
Diffstat (limited to 'src/FbWinFrame.cc')
-rw-r--r-- | src/FbWinFrame.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/FbWinFrame.cc b/src/FbWinFrame.cc index 9e7eedf..eafcb79 100644 --- a/src/FbWinFrame.cc +++ b/src/FbWinFrame.cc | |||
@@ -1204,7 +1204,6 @@ void FbWinFrame::renderTitlebar() { | |||
1204 | m_label_unfocused_pm, | 1204 | m_label_unfocused_pm, |
1205 | m_label.width(), m_label.height()); | 1205 | m_label.width(), m_label.height()); |
1206 | 1206 | ||
1207 | renderButtons(); | ||
1208 | } | 1207 | } |
1209 | 1208 | ||
1210 | void FbWinFrame::renderTabContainer() { | 1209 | void FbWinFrame::renderTabContainer() { |
@@ -1241,6 +1240,8 @@ void FbWinFrame::renderTabContainer() { | |||
1241 | m_labelbutton_active_pm, | 1240 | m_labelbutton_active_pm, |
1242 | m_tab_container.width(), m_tab_container.height(), m_tab_container.orientation()); | 1241 | m_tab_container.width(), m_tab_container.height(), m_tab_container.orientation()); |
1243 | 1242 | ||
1243 | renderButtons(); | ||
1244 | |||
1244 | } | 1245 | } |
1245 | 1246 | ||
1246 | void FbWinFrame::applyTitlebar() { | 1247 | void FbWinFrame::applyTitlebar() { |
@@ -1591,7 +1592,7 @@ void FbWinFrame::applyActiveLabel(FbTk::TextButton &button) { | |||
1591 | button.setAlpha(m_focused?theme().focusedAlpha():theme().unfocusedAlpha()); | 1592 | button.setAlpha(m_focused?theme().focusedAlpha():theme().unfocusedAlpha()); |
1592 | 1593 | ||
1593 | if (m_labelbutton_active_pm != 0) { | 1594 | if (m_labelbutton_active_pm != 0) { |
1594 | button.setBackgroundPixmap(m_labelbutton_active_pm); | 1595 | button.setBackgroundPixmap(m_labelbutton_active_pm); |
1595 | } else | 1596 | } else |
1596 | button.setBackgroundColor(m_labelbutton_active_color); | 1597 | button.setBackgroundColor(m_labelbutton_active_color); |
1597 | 1598 | ||