aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsimonb <simonb>2006-04-17 14:24:11 (GMT)
committersimonb <simonb>2006-04-17 14:24:11 (GMT)
commitdd933c097c0e585949c7200a0937684158f0056d (patch)
tree42e840680fcab62e258e2e5e641f982eb0073614
parentb2105a62c378b013257cd1a79ea5a50b4a90a82f (diff)
downloadfluxbox-dd933c097c0e585949c7200a0937684158f0056d.zip
fluxbox-dd933c097c0e585949c7200a0937684158f0056d.tar.bz2
fix label display with external tabs on some wins
-rw-r--r--ChangeLog3
-rw-r--r--src/FbWinFrame.cc2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8eebecd..6fa7ab5 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/04/17: 3*06/04/17:
4 * Fix display of label for dialog-type boxes (Simon)
5 (only when external tabs are enabled, but not for particular window)
6 FbWinFrame.cc
4 * Fix fbrun position setting (-pos and -nearmouse args) (Simon) 7 * Fix fbrun position setting (-pos and -nearmouse args) (Simon)
5 util/fbrun/... FbRun.hh/cc main.cc 8 util/fbrun/... FbRun.hh/cc main.cc
6 * Resize the clock if the text gets too big, sf.net patch #1436406 9 * Resize the clock if the text gets too big, sf.net patch #1436406
diff --git a/src/FbWinFrame.cc b/src/FbWinFrame.cc
index ccf1087..a72b679 100644
--- a/src/FbWinFrame.cc
+++ b/src/FbWinFrame.cc
@@ -1216,7 +1216,7 @@ void FbWinFrame::applyTitlebar() {
1216 m_titlebar.setAlpha(alpha); 1216 m_titlebar.setAlpha(alpha);
1217 m_label.setAlpha(alpha); 1217 m_label.setAlpha(alpha);
1218 1218
1219 if (externalTabMode()) { 1219 if (m_tabmode != INTERNAL) {
1220 m_label.setGC(m_focused?theme().labelTextFocusGC():theme().labelTextUnfocusGC()); 1220 m_label.setGC(m_focused?theme().labelTextFocusGC():theme().labelTextUnfocusGC());
1221 m_label.setJustify(theme().justify()); 1221 m_label.setJustify(theme().justify());
1222 1222