[Commits] gtkcmclist.c 1.1.2.18 1.1.2.19 gtkcmclist.h 1.1.2.6 1.1.2.7 gtkcmctree.c 1.1.2.20 1.1.2.21 gtkcmctree.h 1.1.2.4 1.1.2.5 gtksctree.c 1.1.4.62 1.1.4.63
colin at claws-mail.org
colin at claws-mail.org
Sun Oct 23 22:50:50 CEST 2011
Update of /home/claws-mail/claws/src/gtk
In directory claws-mail:/tmp/cvs-serv993/src/gtk
Modified Files:
Tag: gtk2
gtkcmclist.c gtkcmclist.h gtkcmctree.c gtkcmctree.h
gtksctree.c
Log Message:
2011-10-23 [colin] 3.7.10cvs44
* src/addressadd.c
* src/addressbook.c
* src/addressbook_foldersel.c
* src/editgroup.c
* src/foldersel.c
* src/folderview.c
* src/grouplistdialog.c
* src/prefs_common.c
* src/prefs_common.h
* src/summaryview.c
* src/gtk/gtkcmclist.c
* src/gtk/gtkcmclist.h
* src/gtk/gtkcmctree.c
* src/gtk/gtkcmctree.h
* src/gtk/gtksctree.c
Refactor some tree stuff (lots of code duplication there)
and switch to cairo for tree rendering.
Index: gtkcmclist.h
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/Attic/gtkcmclist.h,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -d -r1.1.2.6 -r1.1.2.7
--- gtkcmclist.h 2 Jan 2009 10:51:34 -0000 1.1.2.6
+++ gtkcmclist.h 23 Oct 2011 20:50:48 -0000 1.1.2.7
@@ -206,13 +206,6 @@
GtkAdjustment *hadjustment;
GtkAdjustment *vadjustment;
- /* xor GC for the vertical drag line */
- GdkGC *xor_gc;
-
- /* gc for drawing unselected cells */
- GdkGC *fg_gc;
- GdkGC *bg_gc;
-
/* cursor used to indicate dragging */
GdkCursor *cursor_drag;
Index: gtkcmclist.c
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/Attic/gtkcmclist.c,v
retrieving revision 1.1.2.18
retrieving revision 1.1.2.19
diff -u -d -r1.1.2.18 -r1.1.2.19
--- gtkcmclist.c 22 Oct 2011 17:09:04 -0000 1.1.2.18
+++ gtkcmclist.c 23 Oct 2011 20:50:48 -0000 1.1.2.19
@@ -3134,17 +3134,17 @@
metrics = pango_context_get_metrics (context,
style->font_desc,
pango_context_get_language (context));
-
+
if (!GTK_CMCLIST_ROW_HEIGHT_SET(clist))
{
clist->row_height = (pango_font_metrics_get_ascent (metrics) +
pango_font_metrics_get_descent (metrics));
- clist->row_height = PANGO_PIXELS (clist->row_height);
+ clist->row_height = PANGO_PIXELS (clist->row_height) + 2;
}
pango_font_metrics_unref (metrics);
}
-
+
CLIST_REFRESH (clist);
}
Index: gtksctree.c
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/gtksctree.c,v
retrieving revision 1.1.4.62
retrieving revision 1.1.4.63
diff -u -d -r1.1.4.62 -r1.1.4.63
--- gtksctree.c 22 Oct 2011 17:09:04 -0000 1.1.4.62
+++ gtksctree.c 23 Oct 2011 20:50:48 -0000 1.1.4.63
@@ -152,1129 +152,6 @@
return sctree_type;
}
-static gint
-gtk_sctree_draw_cell_pixbuf (GdkWindow *window,
- GdkRectangle *clip_rectangle,
- GdkGC *fg_gc,
- GdkPixbuf *pixbuf,
- gint x,
- gint y,
- gint width,
[...1281 lines suppressed...]
-
static GtkCMCTreeRow *
srow_new (GtkCMCTree *ctree)
{
@@ -2902,7 +1690,6 @@
GtkCMCTreeNode *work;
GtkRequisition requisition;
gboolean visible;
- gint level;
cm_return_if_fail (GTK_IS_CMCTREE (ctree));
@@ -2914,7 +1701,6 @@
GTK_CMCLIST_GET_CLASS (clist)->resync_selection (clist, NULL);
GTK_CMCTREE_ROW (node)->expanded = TRUE;
- level = GTK_CMCTREE_ROW (node)->level;
visible = gtk_cmctree_is_viewable (ctree, node);
/* get cell width if tree_column is auto resized */
Index: gtkcmctree.h
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/Attic/gtkcmctree.h,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -d -r1.1.2.4 -r1.1.2.5
--- gtkcmctree.h 2 Jan 2009 10:51:34 -0000 1.1.2.4
+++ gtkcmctree.h 23 Oct 2011 20:50:48 -0000 1.1.2.5
@@ -68,18 +68,13 @@
typedef enum
{
- GTK_CMCTREE_LINES_NONE,
- GTK_CMCTREE_LINES_SOLID,
- GTK_CMCTREE_LINES_DOTTED,
- GTK_CMCTREE_LINES_TABBED
+ GTK_CMCTREE_LINES_NONE
} GtkCMCTreeLineStyle;
typedef enum
{
GTK_CMCTREE_EXPANDER_NONE,
- GTK_CMCTREE_EXPANDER_SQUARE,
- GTK_CMCTREE_EXPANDER_TRIANGLE,
- GTK_CMCTREE_EXPANDER_CIRCULAR
+ GTK_CMCTREE_EXPANDER_TRIANGLE
} GtkCMCTreeExpanderStyle;
typedef enum
@@ -116,8 +111,6 @@
{
GtkCMCList clist;
- GdkGC *lines_gc;
-
gint tree_indent;
gint tree_spacing;
gint tree_column;
Index: gtkcmctree.c
===================================================================
RCS file: /home/claws-mail/claws/src/gtk/Attic/gtkcmctree.c,v
retrieving revision 1.1.2.20
retrieving revision 1.1.2.21
diff -u -d -r1.1.2.20 -r1.1.2.21
--- gtkcmctree.c 22 Oct 2011 17:09:04 -0000 1.1.2.20
+++ gtkcmctree.c 23 Oct 2011 20:50:48 -0000 1.1.2.21
@@ -80,9 +80,6 @@
if (etype == 0) {
static const GEnumValue values[] = {
{ GTK_CMCTREE_LINES_NONE, "GTK_CMCTREE_LINES_NONE", "none" },
- { GTK_CMCTREE_LINES_SOLID, "GTK_CMCTREE_LINES_SOLID", "solid" },
- { GTK_CMCTREE_LINES_DOTTED, "GTK_CMCTREE_LINES_DOTTED", "dotted" },
- { GTK_CMCTREE_LINES_TABBED, "GTK_CMCTREE_LINES_TABBED", "tabbed" },
{ 0, NULL, NULL }
};
#if GLIB_CHECK_VERSION(2,10,0)
@@ -100,9 +97,7 @@
if (etype == 0) {
[...1871 lines suppressed...]
new_width -= PM_SIZE + 3;
break;
- case GTK_CMCTREE_EXPANDER_SQUARE:
- case GTK_CMCTREE_EXPANDER_CIRCULAR:
- new_width -= PM_SIZE + 1;
- break;
}
switch (expander_style)
@@ -5436,10 +4878,6 @@
case GTK_CMCTREE_EXPANDER_TRIANGLE:
new_width += PM_SIZE + 3;
break;
- case GTK_CMCTREE_EXPANDER_SQUARE:
- case GTK_CMCTREE_EXPANDER_CIRCULAR:
- new_width += PM_SIZE + 1;
- break;
}
gtk_cmclist_set_column_width (clist, ctree->tree_column, new_width);
More information about the Commits
mailing list