diff --git a/direct/src/gui/DirectScrolledList.py b/direct/src/gui/DirectScrolledList.py index 91a0be46e1..6cf11995f2 100644 --- a/direct/src/gui/DirectScrolledList.py +++ b/direct/src/gui/DirectScrolledList.py @@ -80,32 +80,33 @@ class DirectScrolledList(DirectFrame): self.decButton['state'] = DISABLED # Hmm.. just reset self.index to 0 and bail out self.index = 0 - return 0 - - if (self.index <= 0): - self.index = 0 - self.decButton['state'] = DISABLED - self.incButton['state'] = NORMAL - ret = 0 - elif (self.index >= ( len(self["items"]) - self["numItemsVisible"])): - self.index = len(self["items"]) - self["numItemsVisible"] - self.incButton['state'] = DISABLED - self.decButton['state'] = NORMAL ret = 0 else: - self.incButton['state'] = NORMAL - self.decButton['state'] = NORMAL - ret = 1 + if (self.index <= 0): + self.index = 0 + self.decButton['state'] = DISABLED + self.incButton['state'] = NORMAL + ret = 0 + elif (self.index >= ( len(self["items"]) - self["numItemsVisible"])): + self.index = len(self["items"]) - self["numItemsVisible"] + self.incButton['state'] = DISABLED + self.decButton['state'] = NORMAL + ret = 0 + else: + self.incButton['state'] = NORMAL + self.decButton['state'] = NORMAL + ret = 1 # Hide them all for item in self["items"]: item.hide() - # Then show the ones in range + # Then show the ones in range, and stack their positions upperRange = min(len(self["items"]), self["numItemsVisible"]) for i in range(self.index, self.index + upperRange): item = self["items"][i] item.show() item.setPos(0,0, - (i - self.index) * self.maxHeight) + print 'joe' return ret def __scrollByTask(self, task): diff --git a/direct/src/leveleditor/LevelEditor.py b/direct/src/leveleditor/LevelEditor.py index 662a2255a7..a6cd207caa 100644 --- a/direct/src/leveleditor/LevelEditor.py +++ b/direct/src/leveleditor/LevelEditor.py @@ -154,6 +154,8 @@ OBJECT_SNAP_POINTS = { (Vec3(0), Vec3(0))], 'street_keyboard_40x40': [(Vec3(40.0,0,0), Vec3(0)), (Vec3(0), Vec3(0))], + 'street_sunken_40x40': [(Vec3(40.0,0,0), Vec3(0)), + (Vec3(0), Vec3(0))], } # NEIGHBORHOOD DATA