Merge branch 'master' into No_movement_mode

diff --git a/data/images/board/tile_selected.png b/data/images/board/tile_selected.png
index 250ab12d26e9c826644ca977aec513887a035725..4622c84116281009768cc14af230f46d0542c8fe 100644 (file)
Binary files a/data/images/board/tile_selected.png and b/data/images/board/tile_selected.png differ

diff --git a/naja/widgets/tile.py b/naja/widgets/tile.py
index e559d956f57b943295746c239733f4fc1312680b..36b73d09ab81248933b51e1ef6142f76c6fc9ee6 100644 (file)
--- a/naja/widgets/tile.py
+++ b/naja/widgets/tile.py
@@ -40,11 +40,14 @@ class TileWidget(Widget):
         else:
             bg = resources.get_image('board/tile_1.png',
                                      transforms=(EIGHT_BIT,))
+        overlay = None
         if self.highlighted:
-            bg = resources.get_image('board/tile_selected.png',
-                                     transforms=(EIGHT_BIT,))
+            overlay = resources.get_image('board/tile_selected.png',
+                                          transforms=(EIGHT_BIT,))
         self.surface = pygame.surface.Surface(TILE_SIZE)
         self.surface.blit(bg, (0, 0))
+        if overlay is not None:
+            self.surface.blit(overlay, (0, 0))
         # Look up the required bits on the board location
         card = self.state.board_locations[self.board_pos]
         player_pos = self.state.player.position

diff --git a/sources/images/square.xcf b/sources/images/square.xcf
index eb629763d863ec870a11130e022298f75b1620b7..88e66bcaa46ef1c29f677c3cd2708626ac031993 100644 (file)
Binary files a/sources/images/square.xcf and b/sources/images/square.xcf differ