Merge pull request #11 from vihangm/master

Make ScrollOffset compatible with ST3
SublimeText · Mar 4, 2015 · 163d17c · 163d17c
2 parents 2573fa6 + a98acf1
commit 163d17c
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 2 deletions.
diff --git a/Main.sublime-menu b/Main.sublime-menu
@@ -0,0 +1,38 @@
+[
+  {
+    "caption": "Preferences",
+    "id": "preferences",
+    "mnemonic": "n",
+    "children":
+    [
+      {
+        "caption": "Package Settings",
+        "id": "package-settings",
+        "mnemonic": "P",
+        "children":
+        [
+          {
+            "caption": "ScrollOffset",
+            "children":
+            [
+              {
+                "caption": "Settings – Default",
+                "command": "open_file", "args":
+                {
+                  "file": "${packages}/ScrollOffset/ScrollOffset.sublime-settings"
+                }
+              },
+              {
+                "caption": "Settings – User",
+                "command": "open_file", "args":
+                {
+                  "file": "${packages}/User/ScrollOffset.sublime-settings"
+                }
+              }
+            ]
+          }
+        ]
+      }
+    ]
+  }
+]
diff --git a/Scroll Offset.sublime-settings → ScrollOffset.sublime-settings b/Scroll Offset.sublime-settings → ScrollOffset.sublime-settings
@@ -1,6 +1,5 @@
 {
 	"vertical_margin" : 5,
 	"horizontal_margin" : 15,
-
 	"show_debug_guides" : false
 }
diff --git a/scroll_offset.py b/scroll_offset.py
@@ -9,6 +9,8 @@
 """
 
 import sublime, sublime_plugin
+# Python 3 compatibility
+from functools import reduce
 try:
 	import mouse_event_listener
 except:
@@ -40,7 +42,7 @@ def on_selection_modified(self, view):
 		line_height = view.line_height()
 		em_width = view.em_width()
 
-		settings = sublime.load_settings('Scroll Offset.sublime-settings')
+		settings = sublime.load_settings('ScrollOffset.sublime-settings')
 		BOTTOM_OFFSET = settings.get("bottom_margin")
 		TOP_OFFSET = settings.get("top_margin")
 		VERTICAL_OFFSET = settings.get("vertical_margin")