aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authormallum <mallum@b067294f-1dea-0310-9683-c47a78595994>2005-01-11 22:22:26 +0000
committermallum <mallum@b067294f-1dea-0310-9683-c47a78595994>2005-01-11 22:22:26 +0000
commit4d025850330207c7e9bb1eb5137af9b775c52776 (patch)
treeea386e8db0bcbf574b85126fa2c076e1b4299f11 /src
parent58064d445704715d9a58f3202f86fd8374d20f09 (diff)
downloadmatchbox-panel-4d025850330207c7e9bb1eb5137af9b775c52776.tar.gz
matchbox-panel-4d025850330207c7e9bb1eb5137af9b775c52776.tar.bz2
matchbox-panel-4d025850330207c7e9bb1eb5137af9b775c52776.zip
see ChangeLog
git-svn-id: https://svn.o-hand.com/repos/matchbox/trunk/matchbox-panel@1021 b067294f-1dea-0310-9683-c47a78595994
Diffstat (limited to 'src')
-rw-r--r--src/panel.c14
-rw-r--r--src/panel.h2
2 files changed, 13 insertions, 3 deletions
diff --git a/src/panel.c b/src/panel.c
index 9f7820a..c43da93 100644
--- a/src/panel.c
+++ b/src/panel.c
@@ -354,19 +354,29 @@ panel_set_bg(MBPanel *panel, int bg_type, char *bg_spec)
&panel->xcol ))
{
+ /*
XAllocColor(panel->dpy,
DefaultColormap(panel->dpy, panel->screen),
&panel->xcol);
+ */
XSetWindowBackground(panel->dpy, panel->win,
- panel->xcol.pixel);
+ mb_pixbuf_lookup_x_pixel(panel->pb,
+ panel->xcol.red >> 8,
+ panel->xcol.green >> 8,
+ panel->xcol.blue >> 8, 0));
+
+ // panel->xcol.pixel);
XClearWindow(panel->dpy, panel->win);
if (panel->bg_pxm != None)
XFreePixmap(panel->dpy, panel->bg_pxm);
panel->bg_pxm = None;
- snprintf(xprop_def, 32, "rgb:%li", panel->xcol.pixel);
+ snprintf(xprop_def, 32, "rgb:%li", mb_pixbuf_lookup_x_pixel(panel->pb,
+ panel->xcol.red >> 8,
+ panel->xcol.green >> 8,
+ panel->xcol.blue >> 8, 0));
}
panel->root_pixmap_id = 0;
break;
diff --git a/src/panel.h b/src/panel.h
index 05f35de..e7f9081 100644
--- a/src/panel.h
+++ b/src/panel.h
@@ -110,7 +110,7 @@
#define DEFAULT_COLOR_SPEC "#e2e2de" /* Same as gnome ? */
-#define MB_MSG_FONT "Sans-8:bold"
+#define MB_MSG_FONT "Sans 14px"
enum {
BG_SOLID_COLOR,