@@ -3,6 +3,9 @@ REQUIREMENTS ------------ - imlib2 - freetype2 - Xlib + - XRender + - XComposite + - fontconfig - libev - scons and gcc 4.x.x to compile library (tested on gcc 4.2.3) INSTALL @@ -125,7 +125,7 @@ static int commence_panel_redraw; static int commence_switcher_redraw; static const char *theme = "native"; -static const char *version = "bmpanel version 0.9.19"; +static const char *version = "bmpanel version 0.9.20"; static const char *usage = "usage: bmpanel [--version] [--help] [--usage] [--list] THEME"; static void cleanup(); @@ -429,7 +429,7 @@ static Window create_panel_window(uint placement, int h, int hover) if (!hover) hover = h; int y = 0; - uint32_t strut[4] = {0,0,0,hover + X.screen_height - X.wa_h}; + uint32_t strut[4] = {0,0,0,hover + X.screen_height - X.wa_h - X.wa_y}; uint32_t tmp; if (placement == PLACE_TOP) { @@ -437,7 +437,7 @@ static Window create_panel_window(uint placement, int h, int hover) strut[3] = 0; strut[2] = hover + X.wa_y; } else if (placement == PLACE_BOTTOM) - y = X.wa_y + X.wa_h - h; + y = X.wa_y + X.wa_h - hover; win = XCreateWindow(X.display, X.root, X.wa_x, y, X.wa_w, h, 0, X.depth, InputOutput, X.visual, X.amask, &X.attrs); @@ -1239,6 +1239,11 @@ validation: XSetWindowBackgroundPixmap(X.display, P.win, P.bgpix); } + if (P.theme->use_composite && is_element_in_theme(P.theme, 't')) { + LOG_WARNING("tray cannot be used with composite mode enabled"); + theme_remove_element(P.theme, 't'); + } + /* init tray if needed */ if (is_element_in_theme(P.theme, 't')) init_tray(); src/bmpanel.c @@ -606,6 +606,10 @@ void render_update_panel_positions(struct panel *p) break; /* tray */ case 't': + if (!p->trayicons) { + e++; + continue; + } ox += get_tray_width(p->trayicons); break; /* taskbar */ @@ -635,6 +639,10 @@ void render_update_panel_positions(struct panel *p) break; /* tray */ case 't': + if (!p->trayicons) { + e++; + continue; + } ox += update_tray_positions(ox, p->trayicons); break; /* taskbar */ @@ -642,9 +650,9 @@ void render_update_panel_positions(struct panel *p) ox += update_taskbar_positions(taskbarx, taskbarw, p->tasks, p->desktops); break; } - e++; - if (theme->separator_img) + if (*++e && theme->separator_img) { ox += get_image_width(theme->separator_img); + } } } @@ -663,6 +671,10 @@ void render_panel(struct panel *p) ox += switcher_width; break; case 't': + if (!p->trayicons) { + e++; + continue; + } if (tray_width) tile_image(theme->tile_img, tray_pos, tray_width); ox += tray_width; @@ -672,8 +684,7 @@ void render_panel(struct panel *p) ox += taskbar_width; break; } - e++; - if (*e && theme->separator_img) { + if (*++e && theme->separator_img) { draw_image(theme->separator_img, ox); ox += get_image_width(theme->separator_img); } src/render.c themes/native/ds_left_idle_img.png themes/native/ds_right_idle_img.png themes/native/tb_left_idle_img.png themes/native/tb_right_idle_img.png themes/native/tb_tile_idle_img.png @@ -3,7 +3,6 @@ author nsf <no.smile.face@gmail.com> version_major 0 version_minor 3 -use_composite 1 placement bottom tile_img tile_img.png separator_img separator_img.png themes/native/theme themes/native/img.png 2e4b00be5a8bb8dbeddce6d02a36c51ae4840f6e nsf no.smile.face@gmail.com http://github.com/nsf/bmpanel/commit/69844b0d150f26fd45bdd5292d9a456ee1339f03 69844b0d150f26fd45bdd5292d9a456ee1339f03 2008-05-31T11:45:59-07:00 2008-05-31T11:45:59-07:00 Changes, bug fixes. * Updated requirements in INSTALL documentation. * Version is changed to 0.9.20. * Fixed bug with wrong bmpanel placement. * Tray is forced to be disabled when using composite mode now (temporary). * If tray has no icons, separator is being drawn only once. * themes/native theme has no alpha channels now and has composite disabled. 4f0119a39f69617d6aebbd21e7187a4626dee23c nsf no.smile.face@gmail.com