kolan
/
Cairo-Chart
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch '#145_fix_x_bearing' into develop

This commit is contained in:
Kolan Sh 2017-12-30 16:40:43 +03:00
parent e66ae22ff8 63e10b6e13
commit b75386a476
2 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Chart.vala
View File

@ -219,7 +219,7 @@ namespace Gtk.CairoChart {
title_height = sz.height + (legend.position == Legend.Position.TOP ? title_vindent * 2 : title_vindent);
cur_y_min += title_height;
set_source_rgba(title.color);
context.move_to (width/2 - sz.width/2 - sz.x_bearing, sz.height + title_vindent);
context.move_to (width/2 - sz.width/2, sz.height + title_vindent);
show_text(title);
}
@ -380,7 +380,7 @@ namespace Gtk.CairoChart {
var y = legend_y0 + leg_height_sum + max_font_heights[heights_idx];
// series title
context.move_to (x + legend_line_length - title_sz.x_bearing, y);
context.move_to (x + legend_line_length, y);
set_source_rgba (s.title.color);
show_text(s.title);
@ -691,7 +691,7 @@ namespace Gtk.CairoChart {
protected virtual double compact_rec_x_pos (Series s, Float128 x, Text text) {
var sz = text.size(context);
return get_scr_x(s, x) - sz.width / 2.0 - sz.x_bearing
return get_scr_x(s, x) - sz.width / 2.0
- sz.width * (x - (s.axis_x.zoom_min + s.axis_x.zoom_max) / 2.0) / (s.axis_x.zoom_max - s.axis_x.zoom_min);
}
@ -943,7 +943,7 @@ namespace Gtk.CairoChart {
var text_sz = text_t.size(context);
switch (s.axis_y.position) {
case Axis.Position.LOW:
context.move_to (cur_x_min + max_rec_width - text_sz.width + s.axis_y.font_indent - text_sz.x_bearing
context.move_to (cur_x_min + max_rec_width - text_sz.width + s.axis_y.font_indent
+ (s.axis_y.title.text == "" ? 0 : sz.width + s.axis_y.font_indent),
compact_rec_y_pos (s, y, text_t));
show_text(text_t);
@ -959,7 +959,7 @@ namespace Gtk.CairoChart {
context.line_to (double.max (x, plot_area_x_min + (plot_area_x_max - plot_area_x_min) * s.place.zoom_x_high), scr_y);
break;
case Axis.Position.HIGH:
context.move_to (cur_x_max - text_sz.width - s.axis_y.font_indent - text_sz.x_bearing
context.move_to (cur_x_max - text_sz.width - s.axis_y.font_indent
- (s.axis_y.title.text == "" ? 0 : sz.width + s.axis_y.font_indent),
compact_rec_y_pos (s, y, text_t));
show_text(text_t);

22
src/Text.vala
View File

@ -6,9 +6,7 @@ namespace Gtk.CairoChart {
public Color color = Color();
public Cairo.TextExtents get_extents (Cairo.Context context) {
context.select_font_face (style.family,
style.slant,
style.weight);
context.select_font_face (style.family, style.slant, style.weight);
context.set_font_size (style.size);
Cairo.TextExtents extents;
context.text_extents (text, out extents);
@ -33,19 +31,9 @@ namespace Gtk.CairoChart {
}
}
public double get_x_bearing (Cairo.Context context) {
var extents = get_extents (context);
switch (style.orientation) {
case FontOrient.HORIZONTAL: return extents.x_bearing;
case FontOrient.VERTICAL: return extents.y_bearing;
default: return 0.0;
}
}
public struct Size {
double width;
double height;
double x_bearing;
}
public Size size (Cairo.Context context) {
@ -53,14 +41,12 @@ namespace Gtk.CairoChart {
var extents = get_extents (context);
switch (style.orientation) {
case FontOrient.HORIZONTAL:
sz.width = extents.width;
sz.width = extents.width + extents.x_bearing;
sz.height = extents.height;
sz.x_bearing = extents.x_bearing;
break;
case FontOrient.VERTICAL:
sz.width = extents.height;
sz.height = extents.width;
sz.x_bearing = extents.y_bearing;
sz.width = extents.height; // + extents.x_bearing ?
sz.height = extents.width; // +- extents.y_bearing ?
break;
}
return sz;