fix drawing of map items with new Cairo

treellama · Dec 29, 2015 · 06bf8f4 · 06bf8f4
1 parent e53391a
commit 06bf8f4
Show file tree

Hide file tree

Showing 29 changed files with 31 additions and 12 deletions.
diff --git a/gtk-sharp/CairoDrawer.cs b/gtk-sharp/CairoDrawer.cs
@@ -5,6 +5,11 @@
 namespace Weland {
     public class CairoDrawer : Drawer {
 	Context context;
+
+	public Context Context {
+	    get { return context; }
+	}
+
 	public CairoDrawer(Gdk.Window window, bool antialias) {
 	    context = Gdk.CairoHelper.Create(window);
 	    if (!antialias) {

diff --git a/gtk-sharp/MapDrawingArea.cs b/gtk-sharp/MapDrawingArea.cs
@@ -560,25 +560,39 @@ void DrawTriangle(Drawer.Color c, double X, double Y, double angle, bool highlig
 	void DrawImage(Gdk.Pixbuf image, double X, double Y, bool highlight) {
 	    int x = (int) X - image.Width / 2;
 	    int y = (int) Y - image.Height / 2;
-	    if (highlight) {
-		Gdk.GC gc = new Gdk.GC(GdkWindow);
-		if (!PlatformDetection.IsMac) { // UGH
+	    if (drawer is CairoDrawer) {
+		Cairo.Context context = ((CairoDrawer) drawer).Context;
+
+		if (highlight) {
+		    List<Drawer.Point> points = new List<Drawer.Point>();
+		    points.Add(new Drawer.Point(x - 1.5, y - 1.5));
+		    points.Add(new Drawer.Point(x + image.Width + 0.5, y - 1.5));
+		    points.Add(new Drawer.Point(x + image.Width + 0.5, y + image.Height + 0.5));
+		    points.Add(new Drawer.Point(x - 1.5, y + image.Height + 0.5));
+		    drawer.FillPolygon(new Drawer.Color(1, 1, 0), points);
+		}
+
+		Gdk.CairoHelper.SetSourcePixbuf(context, image, x, y);
+		context.Paint();
+	    } else {
+		if (highlight) {
+		    Gdk.GC gc = new Gdk.GC(GdkWindow);
 		    Gdk.Pixmap mask = new Gdk.Pixmap(null, image.Width, image.Height, 1);
 		    image.RenderThresholdAlpha(mask, 0, 0, 0, 0, -1, -1, 1);
 
 		    gc.ClipMask = mask;
-		}
-
-		for (int i = -2; i <= 2; ++i) {
-		    for (int j = -2; j <= 2; ++j) {
-			gc.SetClipOrigin(x + i, y + j);
-			gc.RgbFgColor = new Gdk.Color(255, 255, 0);
-			GdkWindow.DrawRectangle(gc, true, x + i, y + j, image.Width, image.Height);
+		    
+		    for (int i = -2; i <= 2; ++i) {
+			for (int j = -2; j <= 2; ++j) {
+			    gc.SetClipOrigin(x + i, y + j);
+			    gc.RgbFgColor = new Gdk.Color(255, 255, 0);
+			    GdkWindow.DrawRectangle(gc, true, x + i, y + j, image.Width, image.Height);
+			}
 		    }
 		}
+
+		GdkWindow.DrawPixbuf(new Gdk.GC(GdkWindow), image, 0, 0, x, y, -1, -1, Gdk.RgbDither.Normal, 0, 0);
 	    }
-
-	    GdkWindow.DrawPixbuf(new Gdk.GC(GdkWindow), image, 0, 0, x, y, -1, -1, Gdk.RgbDither.Normal, 0, 0);
 	}
 
 	void DrawObject(MapObject obj, bool highlight) {

diff --git a/images/2x.png b/images/2x.png
diff --git a/images/3x.png b/images/3x.png
diff --git a/images/alien-gun.png b/images/alien-gun.png
diff --git a/images/ar-ammo.png b/images/ar-ammo.png
diff --git a/images/ar-grenades.png b/images/ar-grenades.png
diff --git a/images/ar.png b/images/ar.png
diff --git a/images/flag.png b/images/flag.png
diff --git a/images/flower.png b/images/flower.png
diff --git a/images/fusion-ammo.png b/images/fusion-ammo.png
diff --git a/images/fusion.png b/images/fusion.png
diff --git a/images/invinc.png b/images/invinc.png
diff --git a/images/keycard.png b/images/keycard.png
diff --git a/images/oxygen.png b/images/oxygen.png
diff --git a/images/pistol-ammo.png b/images/pistol-ammo.png
diff --git a/images/pistol.png b/images/pistol.png
diff --git a/images/powerup.png b/images/powerup.png
diff --git a/images/rl-ammo.png b/images/rl-ammo.png
diff --git a/images/rl.png b/images/rl.png
diff --git a/images/shotgun-ammo.png b/images/shotgun-ammo.png
diff --git a/images/shotgun.png b/images/shotgun.png
diff --git a/images/skull.png b/images/skull.png
diff --git a/images/smg-ammo.png b/images/smg-ammo.png
diff --git a/images/smg.png b/images/smg.png
diff --git a/images/sound.png b/images/sound.png
diff --git a/images/tozt-ammo.png b/images/tozt-ammo.png
diff --git a/images/tozt.png b/images/tozt.png
diff --git a/images/uplink-chip.png b/images/uplink-chip.png