gfgit/claws-mail
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

2011-11-23 [wwp] 3.7.10cvs100

Browse source 
* src/gtk/gtkcmctree.c
		Make arrows in gtkcmctree's less big (get rid of the outlining),
		patch by Hanno Meyer-Thurow (h.mth@web.de), with few adaptations in offsets/sizes
		calculation.
This commit is contained in:
Tristan Chabredier 2011-11-23 11:44:20 +00:00
parent debddd277f
commit 7b41c08fd4
4 changed files with 24 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2011-11-23 [wwp] 3.7.10cvs100
* src/gtk/gtkcmctree.c
Make arrows in gtkcmctree's less big (get rid of the outlining),
patch by Hanno Meyer-Thurow (h.mth@web.de), with few adaptations in offsets/sizes
calculation.
2011-11-22 [colin] 3.7.10cvs99
* src/account.c

1
PATCHSETS
View file

@ -4303,3 +4303,4 @@
( cvs diff -u -r 1.61.2.101 -r 1.61.2.102 src/account.c; cvs diff -u -r 1.59.2.85 -r 1.59.2.86 src/prefs_filtering.c; cvs diff -u -r 1.6.2.10 -r 1.6.2.11 src/prefs_filtering.h; ) > 3.7.10cvs97.patchset
( cvs diff -u -r 1.105.2.170 -r 1.105.2.171 src/prefs_account.c; ) > 3.7.10cvs98.patchset
( cvs diff -u -r 1.61.2.102 -r 1.61.2.103 src/account.c; cvs diff -u -r 1.59.2.86 -r 1.59.2.87 src/prefs_filtering.c; cvs diff -u -r 1.6.2.11 -r 1.6.2.12 src/prefs_filtering.h; ) > 3.7.10cvs99.patchset
( cvs diff -u -r 1.1.2.24 -r 1.1.2.25 src/gtk/gtkcmctree.c; ) > 3.7.10cvs100.patchset

2
configure.ac
View file

@ -12,7 +12,7 @@ MINOR_VERSION=7
MICRO_VERSION=10
INTERFACE_AGE=0
BINARY_AGE=0
EXTRA_VERSION=99
EXTRA_VERSION=100
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=

51
src/gtk/gtkcmctree.c
View file

@ -435,7 +435,6 @@ draw_expander (GtkCMCTree *ctree,
gint x)
{
GtkCMCList *clist;
GdkPoint points[3];
gint justification_factor;
gint y;
@ -459,48 +458,28 @@ draw_expander (GtkCMCTree *ctree,
return x + justification_factor * (PM_SIZE + 3);
}
/* pixel offsets +/- 1 or +/- justification_factor here and there ..
* to fill correctly, somewhat ... what do I do wrong?
*/
gdk_cairo_set_source_color(cr, &gtk_widget_get_style(GTK_WIDGET(ctree))->fg[GTK_STATE_NORMAL]);
if (ctree_row->expanded)
{
points[0].x = x;
points[0].y = y + (PM_SIZE + 2) / 6;
points[1].x = points[0].x + justification_factor * (PM_SIZE + 2);
points[1].y = points[0].y;
points[2].x = (points[0].x +
justification_factor * (PM_SIZE + 2) / 2);
points[2].y = y + 2 * (PM_SIZE + 2) / 3;
gint tmp3 = PM_SIZE / 2;
gint tmp6 = PM_SIZE / 6;
cairo_move_to(cr, x + justification_factor * (tmp3 + tmp6) + (PM_SIZE / 2), y + 1);
cairo_rel_line_to(cr, 0, tmp3 + tmp6 + 1);
cairo_rel_line_to(cr, -justification_factor * (tmp3 + tmp6) - justification_factor, -1);
cairo_close_path(cr);
}
else
{
points[0].x = x + justification_factor * ((PM_SIZE + 2) / 6 + 2);
points[0].y = y - 1;
points[1].x = points[0].x;
points[1].y = points[0].y + (PM_SIZE + 2);
points[2].x = (points[0].x +
justification_factor * (2 * (PM_SIZE + 2) / 3 - 1));
points[2].y = points[0].y + (PM_SIZE + 2) / 2;
gint tmp3 = PM_SIZE / 2;
gint tmp6 = PM_SIZE / 6;
cairo_move_to(cr, x + tmp6 - justification_factor + (PM_SIZE / 2), y + tmp6 - 1);
cairo_rel_line_to(cr, justification_factor * tmp3, tmp3);
cairo_rel_line_to(cr, -justification_factor * tmp3, tmp3);
}
cairo_new_path(cr);
cairo_set_source_rgb(cr, 255, 255, 255);
cairo_set_line_width(cr, 1);
cairo_set_antialias(cr, CAIRO_ANTIALIAS_NONE);
cairo_move_to(cr, points[0].x, points[0].y);
cairo_line_to(cr, points[1].x, points[1].y);
cairo_line_to(cr, points[2].x, points[2].y);
cairo_close_path(cr);
cairo_fill(cr);
cairo_new_path(cr);
gdk_cairo_set_source_color(cr, &gtk_widget_get_style(GTK_WIDGET(ctree))->fg[GTK_STATE_NORMAL]);
cairo_set_line_width(cr, 1);
cairo_set_antialias(cr, CAIRO_ANTIALIAS_NONE);
cairo_move_to(cr, points[0].x, points[0].y);
cairo_line_to(cr, points[1].x, points[1].y);
cairo_line_to(cr, points[2].x, points[2].y);
cairo_close_path(cr);
cairo_stroke(cr);
cairo_set_antialias(cr, CAIRO_ANTIALIAS_DEFAULT);
x += justification_factor * (PM_SIZE + 3);