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;
}
if (panel_items_order[k] == 'C')
init_clock_panel(p);
+
+ if (panel_items_order[k] == 'F')
+ init_freespace_panel(p);
}
set_panel_items_order(p);
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 (p->g_task.tooltip_enabled || p->clock.area._get_tooltip_text)
+ if (p->g_task.tooltip_enabled || p->clock.area._get_tooltip_text || (launcher_enabled && launcher_tooltip_enabled))
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')
p->area.list = g_slist_append(p->area.list, &p->clock);
+
+ if (panel_items_order[k] == 'F')
+ p->area.list = g_slist_append(p->area.list, &p->freespace);
}
init_rendering(&p->area, 0);
}
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;
}