robot0nfire/fl0w-old
robot0nfire/fl0w-old
Archived
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases Packages Wiki Activity Actions

Fixed back entries

Browse source 
Back entries were crashing the Sublime API when subtitles were disabled.
They also didn't work properly with submenues. Fixed now of course :)
This commit is contained in:
Philip Trauner 2016-12-18 23:22:09 +01:00
parent 05384b2abb
commit 8995fb8e6f
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Sublime/fl0w/SublimeMenu.py
View file

@ -60,10 +60,8 @@ class Menu:
self.back = back self.back = back
entries = self.menu_entries entries = self.menu_entries
if back: if back:
entries.insert(0, ["Back", "Back to previous menu"]) entries.insert(0, ["Back",
if not self.subtitles: "Back to previous menu"] if self.subtitles else ["Back"])
for entry_index in range(len(entries)):
del entries[entry_index][1]
window.show_quick_panel(entries, self._action, window.show_quick_panel(entries, self._action,
flags=0, selected_index=self.selected_index, flags=0, selected_index=self.selected_index,
on_highlight=self.on_highlight) on_highlight=self.on_highlight)
@ -74,7 +72,7 @@ class Menu:
if entry_id != 0: if entry_id != 0:
entry = self.entries[entry_id - 1] entry = self.entries[entry_id - 1]
else: else:
self.back.invoke(self.window) self.back.invoke(self.window, back=self.back.back)
return return
else: else:
entry = self.entries[entry_id] entry = self.entries[entry_id]
@ -92,7 +90,10 @@ class Menu:
def menu_entries(self): def menu_entries(self):
entries = [] entries = []
for entry_id in self.entries: for entry_id in self.entries:
if self.subtitles:
entries.append([self.entries[entry_id].name, self.entries[entry_id].description]) entries.append([self.entries[entry_id].name, self.entries[entry_id].description])
else:
entries.append([self.entries[entry_id].name])
return entries return entries
@ -134,3 +135,6 @@ class Menu:
del self.entries[entry_id] del self.entries[entry_id]
else: else:
raise TypeError("invalid type supplied") raise TypeError("invalid type supplied")
def clear(self):
self.entries = {}