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

OK In progress...

This commit is contained in:
Kolan Sh 2018-01-22 13:22:09 +03:00
parent 9d1f368a93
commit 97721385fc
1 changed files with 7 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
src/Text.vala
View File

@ -13,7 +13,7 @@ namespace CairoChart {
/** /**
* ``Text`` string. * ``Text`` string.
*/ */
public string text { public virtual string text {
get { get {
return _text; return _text;
} }
@ -26,7 +26,7 @@ namespace CairoChart {
/** /**
* ``Text`` font style. * ``Text`` font style.
*/ */
public Font font { public virtual Font font {
get { get {
return _font; return _font;
} }
@ -57,7 +57,7 @@ namespace CairoChart {
/** /**
* Both vertical & horizontal spacing (set only). * Both vertical & horizontal spacing (set only).
*/ */
public double spacing { public virtual double spacing {
protected get { protected get {
return 0; return 0;
} }
@ -70,7 +70,7 @@ namespace CairoChart {
/** /**
* Cairo ``Text`` extents. * Cairo ``Text`` extents.
*/ */
virtual Cairo.TextExtents ext { protected virtual Cairo.TextExtents ext {
get { get {
if (_ext == null) { if (_ext == null) {
chart.ctx.select_font_face (font.family, font.slant, font.weight); chart.ctx.select_font_face (font.family, font.slant, font.weight);
@ -89,7 +89,7 @@ namespace CairoChart {
public virtual double width { public virtual double width {
get { get {
switch (font.orient) { switch (font.orient) {
case Gtk.Orientation.HORIZONTAL: return ext.width; case Gtk.Orientation.HORIZONTAL: return ext.width + ext.x_bearing;
case Gtk.Orientation.VERTICAL: return ext.height; case Gtk.Orientation.VERTICAL: return ext.height;
default: return 0.0; default: return 0.0;
} }
@ -104,8 +104,8 @@ namespace CairoChart {
public virtual double height { public virtual double height {
get { get {
switch (font.orient) { switch (font.orient) {
case Gtk.Orientation.HORIZONTAL: return ext.height; case Gtk.Orientation.HORIZONTAL: return ext.height; // + ext.x_bearing ?
case Gtk.Orientation.VERTICAL: return ext.width; case Gtk.Orientation.VERTICAL: return ext.width; // +- ext.y_bearing ?
default: return 0.0; default: return 0.0;
} }
} }
@ -113,44 +113,6 @@ namespace CairoChart {
} }
} }
/**
* ``Text`` size.
*/
struct Size {
/**
* ``Text`` width.
*/
double width;
/**
* ``Text`` height.
*/
double height;
}
/**
* ``Text`` @{link Size}.
*/
virtual Size size {
get {
var sz = Size();
var e = ext;
switch (font.orient) {
case Gtk.Orientation.HORIZONTAL:
sz.width = e.width + e.x_bearing;
sz.height = e.height;
break;
case Gtk.Orientation.VERTICAL:
sz.width = e.height; // + e.x_bearing ?
sz.height = e.width; // +- e.y_bearing ?
break;
}
return sz;
}
protected set {
}
}
/** /**
* Show ``Text``. * Show ``Text``.
*/ */