diff options
| -rw-r--r-- | Lib/defconQt/glyphView.py | 6 | ||||
| -rw-r--r-- | Lib/defconQt/objects/defcon.py | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/Lib/defconQt/glyphView.py b/Lib/defconQt/glyphView.py index 45ba255..fb39e1c 100644 --- a/Lib/defconQt/glyphView.py +++ b/Lib/defconQt/glyphView.py @@ -367,7 +367,7 @@ class MainGfxWindow(QMainWindow): oldView = self.view # Preserve the selected layer (by setting the glyph from that layer) # Todo: If that layer is already in the glyph, it would be a little bit - # harder to create it here and may be better or worse. Worse becaue + # harder to create it here and may be better or worse. Worse because # we'd alter the data without being explicitly asked to do so. # Ask someone who does UX. if oldView: @@ -383,6 +383,7 @@ class MainGfxWindow(QMainWindow): # GlyphView? If yes, we should make an interface for a # predecessor -> successor transformation if oldView: + self.view._currentTool = oldView._currentTool self.view.setTransform(oldView.transform()) self._setlayerColorButtonColor() @@ -2310,8 +2311,7 @@ class GlyphView(QGraphicsView): def _makeLayerGlyph(self, layer): name = self._name - layer.newGlyph(name) - glyph = layer[name] + glyph = layer.newGlyph(name) # TODO: generalize this out, can’t use newStandardGlyph unfortunately glyph.width = self.defaultWidth diff --git a/Lib/defconQt/objects/defcon.py b/Lib/defconQt/objects/defcon.py index e9c3470..496f1c6 100644 --- a/Lib/defconQt/objects/defcon.py +++ b/Lib/defconQt/objects/defcon.py @@ -19,9 +19,7 @@ class TFont(Font): if not override: if name in self: return None - # XXX(defcon): newGlyph should return the glyph - self.newGlyph(name) - glyph = self[name] + glyph = self.newGlyph(name) glyph.width = width # TODO: list ought to be changeable from AGL2UV if addUnicode: |