[gnome-maps/wip/mlundblad/dont-use-offscreen-window] WIP: transitPrintLayout: Use Cairo and Pango to render
- From: Marcus Lundblad <mlundblad src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-maps/wip/mlundblad/dont-use-offscreen-window] WIP: transitPrintLayout: Use Cairo and Pango to render
- Date: Mon, 18 Mar 2019 21:58:52 +0000 (UTC)
commit 8b8b3c8efdfd7cec1daeb08d41ab9af28cc9e8c1
Author: Marcus Lundblad <ml update uu se>
Date: Sun Mar 17 22:22:29 2019 +0100
WIP: transitPrintLayout: Use Cairo and Pango to render
src/transitPrintLayout.js | 40 ++++++++++++++++++++++++++++++++--------
1 file changed, 32 insertions(+), 8 deletions(-)
---
diff --git a/src/transitPrintLayout.js b/src/transitPrintLayout.js
index 5648390..fa35fd4 100644
--- a/src/transitPrintLayout.js
+++ b/src/transitPrintLayout.js
@@ -25,9 +25,12 @@ const Clutter = imports.gi.Clutter;
const Gdk = imports.gi.Gdk;
const GObject = imports.gi.GObject;
const Gtk = imports.gi.Gtk;
+const Pango = imports.gi.Pango;
+const Gfx = imports.gfx;
const MapSource = imports.mapSource;
const PrintLayout = imports.printLayout;
+const Transit = imports.transit;
const TransitArrivalMarker = imports.transitArrivalMarker;
const TransitArrivalRow = imports.transitArrivalRow;
const TransitBoardMarker = imports.transitBoardMarker;
@@ -220,18 +223,39 @@ class TransitPrintLayout extends PrintLayout.PrintLayout {
start: start,
print: true
});
+ let pageNum = this.numPages - 1;
+ let x = this._cursorX;
+ let y = this._cursorY;
+ let surface = new Cairo.ImageSurface(Cairo.Format.ARGB32, width, height);
+ let cr = new Cairo.Context(surface);
- this._renderWidget(legRow, width, height);
+ this._drawIcon(cr, leg.iconName, width, height);
+
+ this._addSurface(surface, x, y, pageNum);
}
_drawArrival(width, height) {
- let arrivalRow = new TransitArrivalRow.TransitArrivalRow({
- visible: true,
- itinerary: this._itinerary,
- print: true
- });
-
- this._renderWidget(arrivalRow, width, height);
+ let pageNum = this.numPages - 1;
+ let x = this._cursorX;
+ let y = this._cursorY;
+ let surface = new Cairo.ImageSurface(Cairo.Format.ARGB32, width, height);
+ let cr = new Cairo.Context(surface);
+ let lastLeg = this._itinerary.legs[this._itinerary.legs.length - 1];
+
+ this._drawIcon(cr, 'maps-point-end-symbolic', width, height);
+ // draw the arrival text
+ this._drawTextVerticallyCentered(cr, Transit.getArrivalLabel(lastLeg),
+ width - height * 3,
+ height, this._rtl ? height * 2 : height,
+ Pango.Alignment.LEFT);
+ // draw arrival time
+ this._drawTextVerticallyCentered(cr, lastLeg.prettyPrintArrivalTime(),
+ height * 2, height,
+ this._rtl ? 0 : width - height * 2 - 1,
+ this._rtl ? Pango.Alignment.LEFT :
+ Pango.Alignment.RIGHT);
+
+ this._addSurface(surface, x, y, pageNum);
}
_legHasMiniMap(index) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]