summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Theme.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Theme.cc b/src/Theme.cc
index ada4daa..c20d27c 100644
--- a/src/Theme.cc
+++ b/src/Theme.cc
@@ -21,7 +21,7 @@
21// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 21// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
22// DEALINGS IN THE SOFTWARE. 22// DEALINGS IN THE SOFTWARE.
23 23
24// $Id: Theme.cc,v 1.32 2002/10/29 16:07:27 fluxgen Exp $ 24// $Id: Theme.cc,v 1.33 2002/11/03 10:39:25 fluxgen Exp $
25 25
26#ifndef _GNU_SOURCE 26#ifndef _GNU_SOURCE
27#define _GNU_SOURCE 27#define _GNU_SOURCE
@@ -519,10 +519,12 @@ void Theme::loadToolbarStyle() {
519 readDatabaseColor("toolbar.label.textColor", "Toolbar.Label.TextColor", 519 readDatabaseColor("toolbar.label.textColor", "Toolbar.Label.TextColor",
520 &m_toolbarstyle.l_text, 520 &m_toolbarstyle.l_text,
521 WhitePixel(m_display, m_screennum)); 521 WhitePixel(m_display, m_screennum));
522
522 readDatabaseColor("toolbar.windowLabel.textColor", 523 readDatabaseColor("toolbar.windowLabel.textColor",
523 "Toolbar.WindowLabel.TextColor", 524 "Toolbar.WindowLabel.TextColor",
524 &m_toolbarstyle.w_text, 525 &m_toolbarstyle.w_text,
525 WhitePixel(m_display, m_screennum)); 526 WhitePixel(m_display, m_screennum));
527
526 readDatabaseColor("toolbar.clock.textColor", "Toolbar.Clock.TextColor", 528 readDatabaseColor("toolbar.clock.textColor", "Toolbar.Clock.TextColor",
527 &m_toolbarstyle.c_text, 529 &m_toolbarstyle.c_text,
528 WhitePixel(m_display, m_screennum)); 530 WhitePixel(m_display, m_screennum));
@@ -915,7 +917,7 @@ void Theme::reconfigure(bool antialias) {
915 XChangeGC(m_display, m_menustyle.hilite_gc, 917 XChangeGC(m_display, m_menustyle.hilite_gc,
916 gc_value_mask, &gcv); 918 gc_value_mask, &gcv);
917 919
918 gc_value_mask |= GCFont; 920 gcv.foreground = m_toolbarstyle.l_text.pixel();
919 XChangeGC(m_display, m_toolbarstyle.l_text_gc, 921 XChangeGC(m_display, m_toolbarstyle.l_text_gc,
920 gc_value_mask, &gcv); 922 gc_value_mask, &gcv);
921 923