aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormathias <mathias>2005-06-07 09:01:29 (GMT)
committermathias <mathias>2005-06-07 09:01:29 (GMT)
commita663db8fd369fb04ad55cfb599e8c7fdecca6d1e (patch)
treec8bbd13a92f2244b72539890051e36fa66c891ae
parent99a7f9a11084525e15407bdf7372728dadd7be98 (diff)
downloadfluxbox-a663db8fd369fb04ad55cfb599e8c7fdecca6d1e.zip
fluxbox-a663db8fd369fb04ad55cfb599e8c7fdecca6d1e.tar.bz2
Fixed justification in WorkspaceNameTool #1213262, values were set after the
render() call was made.
-rw-r--r--ChangeLog3
-rw-r--r--src/WorkspaceNameTool.cc10
2 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index f32d2ed..845fb5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
1(Format: Year/Month/Day) 1(Format: Year/Month/Day)
2Changes for 0.9.14: 2Changes for 0.9.14:
3*05/06/07:
4 * Fixed justification in WorkspaceNameTool #1213262 (Mathias)
5 WorkspaceNameTool.cc
3*05/06/03: 6*05/06/03:
4 * Massive change of font handling (Mathias) 7 * Massive change of font handling (Mathias)
5 - Usage of xft-fonts is prefered, except a font-description starts with '-' 8 - Usage of xft-fonts is prefered, except a font-description starts with '-'
diff --git a/src/WorkspaceNameTool.cc b/src/WorkspaceNameTool.cc
index fdc4ffe..ee6db7b 100644
--- a/src/WorkspaceNameTool.cc
+++ b/src/WorkspaceNameTool.cc
@@ -127,6 +127,12 @@ void WorkspaceNameTool::reRender() {
127} 127}
128 128
129void WorkspaceNameTool::renderTheme(unsigned char alpha) { 129void WorkspaceNameTool::renderTheme(unsigned char alpha) {
130
131 m_button.setJustify(m_theme.justify());
132 m_button.setBorderWidth(m_theme.border().width());
133 m_button.setBorderColor(m_theme.border().color());
134 m_button.setAlpha(alpha);
135
130 if (!m_theme.texture().usePixmap()) { 136 if (!m_theme.texture().usePixmap()) {
131 if (m_pixmap) 137 if (m_pixmap)
132 m_screen.imageControl().removeImage(m_pixmap); 138 m_screen.imageControl().removeImage(m_pixmap);
@@ -136,9 +142,5 @@ void WorkspaceNameTool::renderTheme(unsigned char alpha) {
136 reRender(); 142 reRender();
137 } 143 }
138 144
139 m_button.setJustify(m_theme.justify());
140 m_button.setBorderWidth(m_theme.border().width());
141 m_button.setBorderColor(m_theme.border().color());
142 m_button.setAlpha(alpha);
143 m_button.clear(); 145 m_button.clear();
144} 146}