if (!panel1) return;
cleanup_taskbar();
+ // taskbarname_font_desc freed here because cleanup_taskbarname() called on _NET_NUMBER_OF_DESKTOPS
+ if (taskbarname_font_desc) pango_font_description_free(taskbarname_font_desc);
int i;
Panel *p;
if (panel_items_order[k] == 'B')
init_battery_panel(p);
#endif
- if (panel_items_order[k] == 'S') {
+ if (panel_items_order[k] == 'S' && i==0) {
// TODO : check systray is only on 1 panel
+ // at the moment only on panel1[0] allowed
init_systray_panel(p);
refresh_systray = 1;
}
p->main_win = XCreateWindow(server.dsp, server.root_win, p->posx, p->posy, p->area.width, p->area.height, 0, server.depth, InputOutput, server.visual, mask, &att);
long event_mask = ExposureMask|ButtonPressMask|ButtonReleaseMask|ButtonMotionMask;
- if (g_tooltip.enabled)
+ if (p->g_task.tooltip_enabled || p->clock.area._get_tooltip_text || p->launcher.area.on_screen)
event_mask |= PointerMotionMask|LeaveWindowMask;
if (panel_autohide)
event_mask |= LeaveWindowMask|EnterWindowMask;
panel->area.width = (float)server.monitor[panel->monitor].width * panel->area.width / 100;
if (panel->pourcenty)
panel->area.height = (float)server.monitor[panel->monitor].height * panel->area.height / 100;
+ if (panel->area.width + panel->marginx > server.monitor[panel->monitor].width)
+ panel->area.width = server.monitor[panel->monitor].width - panel->marginx;
if (panel->area.bg->border.rounded > panel->area.height/2) {
printf("panel_background_id rounded is too big... please fix your tint2rc\n");
g_array_append_val(backgrounds, *panel->area.bg);
panel->area.width = (float)server.monitor[panel->monitor].width * old_panel_height / 100;
else
panel->area.width = old_panel_height;
+ if (panel->area.height + panel->marginy > server.monitor[panel->monitor].height)
+ panel->area.height = server.monitor[panel->monitor].height - panel->marginy;
if (panel->area.bg->border.rounded > panel->area.width/2) {
printf("panel_background_id rounded is too big... please fix your tint2rc\n");
g_array_append_val(backgrounds, *panel->area.bg);
if (panel_items_order[k] == 'B')
p->area.list = g_slist_append(p->area.list, &p->battery);
#endif
- if (panel_items_order[k] == 'S') {
+ if (panel_items_order[k] == 'S' && p == panel1) {
// TODO : check systray is only on 1 panel
+ // at the moment only on panel1[0] allowed
p->area.list = g_slist_append(p->area.list, &systray);
}
if (panel_items_order[k] == 'C')
for (k=0; k<TASKBAR_STATE_COUNT; ++k) {
if (tskbar->state_pix[k]) XFreePixmap(server.dsp, tskbar->state_pix[k]);
tskbar->state_pix[k] = 0;
+ if (tskbar->bar_name.state_pix[k]) XFreePixmap(server.dsp, tskbar->bar_name.state_pix[k]);
+ tskbar->bar_name.state_pix[k] = 0;
}
tskbar->area.pix = 0;
+ tskbar->bar_name.area.pix = 0;
l0 = tskbar->area.list;
if (taskbarname_enabled) l0 = l0->next;
for (; l0 ; l0 = l0->next) {
GSList* it = result->list;
while (it) {
Area* a = it->data;
- if (panel_horizontal) {
- if (a->on_screen && x >= a->posx && x <= (a->posx + a->width)) {
- new_result = a;
- break;
- }
- } else {
- if (a->on_screen && y >= a->posy && y <= (a->posy + a->height)) {
- new_result = a;
- break;
- }
+ if (a->on_screen && x >= a->posx && x <= (a->posx + a->width)
+ && y >= a->posy && y <= (a->posy + a->height)) {
+ new_result = a;
+ break;
}
it = it->next;
}