Author: cazfi
Date: Sat Feb 21 21:32:40 2015
New Revision: 28272

URL: http://svn.gna.org/viewcvs/freeciv?rev=28272&view=rev
Log:
Draw city map partially invisible (black background getting throuhg) when the 
city
is under governor control in gtk3-client

Reported by Jacob Nevins <jtn>

See bug #22834

Modified:
    branches/S2_4/client/gui-gtk-2.0/citydlg.c
    branches/S2_4/client/gui-gtk-3.0/citydlg.c

Modified: branches/S2_4/client/gui-gtk-2.0/citydlg.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_4/client/gui-gtk-2.0/citydlg.c?rev=28272&r1=28271&r2=28272&view=diff
==============================================================================
--- branches/S2_4/client/gui-gtk-2.0/citydlg.c  (original)
+++ branches/S2_4/client/gui-gtk-2.0/citydlg.c  Sat Feb 21 21:32:40 2015
@@ -1505,9 +1505,6 @@
                        i * width, 0);
   }
   gtk_pixcomm_thaw(GTK_PIXCOMM(pdialog->citizen_pixmap));
-
-/*  gtk_widget_set_sensitive(pdialog->citizen_pixmap,*/
-/*                           !cma_is_city_under_agent(pcity, NULL));*/
 }
 
 /****************************************************************

Modified: branches/S2_4/client/gui-gtk-3.0/citydlg.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_4/client/gui-gtk-3.0/citydlg.c?rev=28272&r1=28271&r2=28272&view=diff
==============================================================================
--- branches/S2_4/client/gui-gtk-3.0/citydlg.c  (original)
+++ branches/S2_4/client/gui-gtk-3.0/citydlg.c  Sat Feb 21 21:32:40 2015
@@ -358,7 +358,11 @@
 
   cairo_scale(cr, CITYMAP_SCALE, CITYMAP_SCALE);
   cairo_set_source_surface(cr, pdialog->map_canvas_store_unscaled, 0, 0);
-  cairo_paint(cr);
+  if (!gtk_widget_get_sensitive(pdialog->overview.map_canvas.ebox)) {
+    cairo_paint_with_alpha(cr, 0.5);
+  } else {
+    cairo_paint(cr);
+  }
 
   return TRUE;
 }
@@ -1553,9 +1557,6 @@
                        get_citizen_sprite(tileset, citizens[i], i, pcity),
                        i * width, 0);
   }
-
-/*  gtk_widget_set_sensitive(pdialog->citizen_pixmap,*/
-/*                           !cma_is_city_under_agent(pcity, NULL));*/
 }
 
 /****************************************************************


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to