- cs = cairo_xlib_surface_create(server.dsp, pmap, server.visual, battery->area.width, battery->area.height);
- c = cairo_create(cs);
- layout = pango_cairo_create_layout(c);
-
- // check width
- pango_layout_set_font_description(layout, bat1_font_desc);
- pango_layout_set_indent(layout, 0);
- pango_layout_set_text(layout, buf_bat_percentage, strlen(buf_bat_percentage));
- pango_layout_get_pixel_size(layout, &percentage_width, NULL);
-
- pango_layout_set_font_description(layout, bat2_font_desc);
- pango_layout_set_indent(layout, 0);
- pango_layout_set_text(layout, buf_bat_time, strlen(buf_bat_time));
- pango_layout_get_pixel_size(layout, &time_width, NULL);
-
- if(percentage_width > time_width) new_width = percentage_width;
- else new_width = time_width;
-
- new_width += (2*battery->area.paddingxlr) + (2*battery->area.pix.border.width);
-
- int old_width = battery->area.width;
-
- Panel *panel = ((Area*)obj)->panel;
- battery->area.width = new_width + 1;
- battery->area.posx = panel->area.width - battery->area.width - panel->area.paddingxlr - panel->area.pix.border.width;
- if (panel->clock.area.on_screen)
- battery->area.posx -= (panel->clock.area.width + panel->area.paddingx);
-
- if(new_width > old_width || new_width < (old_width-6)) {
- // refresh and resize other objects on panel
- // we try to limit the number of refresh
- // printf("battery_width %d, new_width %d\n", battery->area.width, new_width);
- panel->area.resize = 1;
- systray.area.resize = 1;
- panel_refresh = 1;
+ if (panel_horizontal) {
+ int new_size = (bat_percentage_width > bat_time_width) ? bat_percentage_width : bat_time_width;
+ new_size += (2*battery->area.paddingxlr) + (2*battery->area.bg->border.width);
+ if (new_size > battery->area.width || new_size < (battery->area.width-2)) {
+ // we try to limit the number of resize
+ battery->area.width = new_size;
+ battery->bat1_posy = ((battery->area.height - bat_percentage_height) / 2) - ((bat_time_height_ink + 2) / 2);
+ battery->bat2_posy = battery->bat1_posy + bat_percentage_height + 2 - (bat_percentage_height - bat_percentage_height_ink)/2 - (bat_time_height - bat_time_height_ink)/2;
+ ret = 1;
+ }
+ }
+ else {
+ int new_size = bat_percentage_height + bat_time_height + (2 * (battery->area.paddingxlr + battery->area.bg->border.width));
+ if (new_size != battery->area.height) {
+ battery->area.height = new_size;
+ battery->bat1_posy = ((battery->area.height - bat_percentage_height) / 2) - ((bat_time_height_ink + 2) / 2);
+ battery->bat2_posy = battery->bat1_posy + bat_percentage_height + 2 - (bat_percentage_height - bat_percentage_height_ink)/2 - (bat_time_height - bat_time_height_ink)/2;
+ ret = 1;
+ }