- snprintf(buf_bat_time, sizeof(buf_bat_time), "%02d:%02d", battery_state.time.hours, battery_state.time.minutes);
- // vertical panel doen't adjust width
- if (!panel_horizontal) return;
-
- cairo_surface_t *cs;
- cairo_t *c;
- Pixmap pmap;
- pmap = XCreatePixmap(server.dsp, server.root_win, battery->area.width, battery->area.height, server.depth);
-
- 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(battery_state.state == BATTERY_FULL) {
+ strcpy(buf_bat_time, "Full");
+ } else {
+ snprintf(buf_bat_time, sizeof(buf_bat_time), "%02d:%02d", battery_state.time.hours, battery_state.time.minutes);
+ }
+ get_text_size2(bat1_font_desc, &bat_percentage_height_ink, &bat_percentage_height, &bat_percentage_width, panel->area.height, panel->area.width, buf_bat_percentage, strlen(buf_bat_percentage));
+ get_text_size2(bat2_font_desc, &bat_time_height_ink, &bat_time_height, &bat_time_width, panel->area.height, panel->area.width, buf_bat_time, strlen(buf_bat_time));