From 07cd58bfbc7e3edd9ab344be18df631508c0b0c3 Mon Sep 17 00:00:00 2001
From: Neil <neil@dip.sun.ac.za>
Date: Sun, 14 Apr 2013 20:45:46 +0200
Subject: [PATCH] Rework display code to avoid Scatter widget
---
erdslangetjie/editor/editor.py | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/erdslangetjie/editor/editor.py b/erdslangetjie/editor/editor.py
index ecdbec7..c2d2745 100644
--- a/erdslangetjie/editor/editor.py
+++ b/erdslangetjie/editor/editor.py
@@ -1,24 +1,23 @@
import sys
import os
import kivy
-from erdslangetjie.data import filepath, load
-from erdslangetjie.level import Level
kivy.require('1.6.0')
from kivy.app import App
from kivy.logger import Logger, LoggerHistory
from kivy.uix.widget import Widget
-
from kivy.uix.floatlayout import FloatLayout
-from kivy.uix.scatter import Scatter
from kivy.graphics import Color, Rectangle
+from erdslangetjie.data import filepath, load
+from erdslangetjie.level import Level
+
class EditorWindow(FloatLayout):
def __init__(self, level):
- super(EditorWindow, self).__init__()
+ super(EditorWindow, self).__init__(size=(960, 960))
if os.path.exists(filepath(level)):
level_data = load(level)
self.level = level
@@ -44,10 +43,11 @@ class EditorWindow(FloatLayout):
for tile_line in tiles:
bx = 0
for tile in tile_line:
- node = Scatter(pos=(bx, by), size=(tile_size, tile_size))
+ node = Widget(size=(tile_size, tile_size), pos=(bx, by))
with node.canvas:
Color(1, 1, 1)
- Rectangle(size=node.size, texture=tile.texture)
+ Rectangle(pos=node.pos, size=node.size,
+ texture=tile.texture)
self.add_widget(node)
bx += tile_size
by += tile_size
--
2.34.1