mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-02-20 21:26:53 +00:00
Code Issues Releases Wiki Activity

(trunk gtk) simplify the compact mode rendering code a bit

Browse source
This commit is contained in:
Charles Kerr 2010-07-31 03:43:12 +00:00
parent 48304add97
commit d1ee0559dc
1 changed files with 10 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
gtk/torrent-cell-renderer.c
View file

@ -539,7 +539,6 @@ render_compact( TorrentCellRenderer * cell,
GdkRectangle * expose_area UNUSED,
GtkCellRendererState flags )
{
int w, h;
GdkRectangle icon_area;
GdkRectangle name_area;
GdkRectangle stat_area;
@ -561,56 +560,27 @@ render_compact( TorrentCellRenderer * cell,
name = tr_torrentInfo( tor )->name;
status = getShortStatusString( tor, st, p->upload_speed_KBps, p->download_speed_KBps );
/* get the cell dimensions */
g_object_set( p->icon_renderer, "pixbuf", icon, NULL );
gtk_cell_renderer_get_size( p->icon_renderer, widget, NULL, NULL, NULL, &w, &h );
icon_area.width = w;
icon_area.height = h;
text_renderer = get_text_renderer( st, cell );
g_object_set( text_renderer, "text", name, "ellipsize", PANGO_ELLIPSIZE_NONE, "scale", 1.0, NULL );
gtk_cell_renderer_get_size( text_renderer, widget, NULL, NULL, NULL, &w, &h );
name_area.width = w;
name_area.height = h;
g_object_set( text_renderer, "text", status, "scale", SMALL_SCALE, NULL );
gtk_cell_renderer_get_size( text_renderer, widget, NULL, NULL, NULL, &w, &h );
stat_area.width = w;
stat_area.height = h;
prog_area.height = p->bar_height;
h = 1;
h = MAX( h, stat_area.height );
h = MAX( h, name_area.height );
h = MAX( h, icon_area.height );
h = MAX( h, prog_area.height );
/**
*** LAYOUT
**/
fill_area = *background_area;
fill_area.x += cell->parent.xpad;
fill_area.y += cell->parent.ypad;
fill_area.width -= cell->parent.xpad * 2;
fill_area.height -= cell->parent.ypad * 2;
icon_area = name_area = stat_area = prog_area = fill_area;
g_object_set( p->icon_renderer, "pixbuf", icon, NULL );
gtk_cell_renderer_get_size( p->icon_renderer, widget, NULL, NULL, NULL, &icon_area.width, NULL );
text_renderer = get_text_renderer( st, cell );
g_object_set( text_renderer, "text", name, "ellipsize", PANGO_ELLIPSIZE_NONE, "scale", 1.0, NULL );
gtk_cell_renderer_get_size( text_renderer, widget, NULL, NULL, NULL, &name_area.width, NULL );
g_object_set( text_renderer, "text", status, "scale", SMALL_SCALE, NULL );
gtk_cell_renderer_get_size( text_renderer, widget, NULL, NULL, NULL, &stat_area.width, NULL );
/* icon */
icon_area.x = fill_area.x;
icon_area.y = fill_area.y;
icon_area.height = h;
/* progressbar */
prog_area.x = fill_area.x + fill_area.width - BAR_WIDTH;
prog_area.y = fill_area.y;
prog_area.width = BAR_WIDTH;
prog_area.height = h;
/* short status (right justified) */
stat_area.x = prog_area.x - GUI_PAD - stat_area.width;
stat_area.y = fill_area.y + ( h - stat_area.height ) / 2;
/* name */
name_area.x = icon_area.x + icon_area.width + GUI_PAD;
name_area.y = fill_area.y + ( h - name_area.height ) / 2;
name_area.y = fill_area.y;
name_area.width = stat_area.x - GUI_PAD - name_area.x;
/**