From 12bff625fdc9c2efd72fb0f006d1b885ebf1fb23 Mon Sep 17 00:00:00 2001 From: Palf Date: Sat, 18 Apr 2026 12:59:58 +0900 Subject: [PATCH 1/2] =?UTF-8?q?Revert=20"feat:=20=E8=A8=AD=E5=AE=9A?= =?UTF-8?q?=E3=83=A1=E3=83=8B=E3=83=A5=E3=83=BC=E3=82=92Edit=E5=86=85?= =?UTF-8?q?=E3=81=AEMaster=20Grid=E7=9B=B4=E5=BE=8C=E3=81=AB=E6=8C=BF?= =?UTF-8?q?=E5=85=A5"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit dc0d3aa0394e310e9324c94f0041a807441fd24c. --- .../Contents/Resources/plugin.py | 20 +------------------ 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/SnappingGrid.glyphsPlugin/Contents/Resources/plugin.py b/SnappingGrid.glyphsPlugin/Contents/Resources/plugin.py index 424417f..a7ed670 100644 --- a/SnappingGrid.glyphsPlugin/Contents/Resources/plugin.py +++ b/SnappingGrid.glyphsPlugin/Contents/Resources/plugin.py @@ -11,7 +11,6 @@ NSTextField, NSStepper, NSButton, NSColorWell, NSBundle, NSNib, NSAttributedString, NSFont, NSForegroundColorAttributeName, NSFontAttributeName, - NSApp, ) from Foundation import NSObject, NSSelectorFromString @@ -536,24 +535,7 @@ def start(self): settingsItem = NSMenuItem(settingsLabel, callback=self._showSettings_, target=self) else: settingsItem = NSMenuItem(settingsLabel, self._showSettings_) - inserted = False - try: - main_menu = NSApp.mainMenu() - for top_item in main_menu.itemArray(): - submenu = top_item.submenu() - if submenu is None: - continue - for i, item in enumerate(submenu.itemArray()): - if 'Master Grid' in (item.title() or ''): - submenu.insertItem_atIndex_(settingsItem, i + 1) - inserted = True - break - if inserted: - break - except Exception: - pass - if not inserted: - Glyphs.menu[EDIT_MENU].append(settingsItem) + Glyphs.menu[EDIT_MENU].append(settingsItem) Glyphs.addCallback(self._drawGrid_, DRAWBACKGROUND) Glyphs.addCallback(self._snapDuringDrag_, MOUSEDRAGGED) From deb1f14ad9b1ca31bfdac6de6d2df79e9ca796b2 Mon Sep 17 00:00:00 2001 From: Palf Date: Sat, 18 Apr 2026 13:07:37 +0900 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E8=A8=AD=E5=AE=9A=E3=83=A1?= =?UTF-8?q?=E3=83=8B=E3=83=A5=E3=83=BC=E3=82=92Edit=E5=86=85=E3=81=AEPaste?= =?UTF-8?q?=E7=9B=B4=E5=BE=8C=E3=81=AB=E6=8C=BF=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Contents/Resources/plugin.py | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/SnappingGrid.glyphsPlugin/Contents/Resources/plugin.py b/SnappingGrid.glyphsPlugin/Contents/Resources/plugin.py index a7ed670..50aa9c2 100644 --- a/SnappingGrid.glyphsPlugin/Contents/Resources/plugin.py +++ b/SnappingGrid.glyphsPlugin/Contents/Resources/plugin.py @@ -11,6 +11,7 @@ NSTextField, NSStepper, NSButton, NSColorWell, NSBundle, NSNib, NSAttributedString, NSFont, NSForegroundColorAttributeName, NSFontAttributeName, + NSApp, ) from Foundation import NSObject, NSSelectorFromString @@ -535,7 +536,24 @@ def start(self): settingsItem = NSMenuItem(settingsLabel, callback=self._showSettings_, target=self) else: settingsItem = NSMenuItem(settingsLabel, self._showSettings_) - Glyphs.menu[EDIT_MENU].append(settingsItem) + inserted = False + try: + main_menu = NSApp.mainMenu() + for top_item in main_menu.itemArray(): + submenu = top_item.submenu() + if submenu is None: + continue + for i, item in enumerate(submenu.itemArray()): + if (item.title() or '') == 'Paste': + submenu.insertItem_atIndex_(settingsItem, i + 1) + inserted = True + break + if inserted: + break + except Exception: + pass + if not inserted: + Glyphs.menu[EDIT_MENU].append(settingsItem) Glyphs.addCallback(self._drawGrid_, DRAWBACKGROUND) Glyphs.addCallback(self._snapDuringDrag_, MOUSEDRAGGED)