eessppeelllloo/r_e_c_u_r
1
0
Fork 0
mirror of https://github.com/cyberboy666/r_e_c_u_r.git synced 2025-12-12 11:20:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature_shader_midi

Browse Source
This commit is contained in:
Tristan Rowley
2019-12-14 14:24:19 +00:00
parent 56eab3a232 6c3848cf6c
commit 168e83f90d
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
display_centre/menu.py
View File

@@ -79,7 +79,7 @@ class BrowserMenu(Menu):
root, dirs, files = next(os.walk(current_path))
indent = ' ' * 4 * (current_level)
for folder in dirs:
for folder in sorted(dirs):
is_open, char = self._check_folder_state(folder)
self.menu_list.append(dict(name='{}{}{}'.format(indent, folder, char), slot='x'))
if (is_open):
@@ -87,6 +87,7 @@ class BrowserMenu(Menu):
next_level = current_level + 1
self._add_folder_to_browser_list(next_path, next_level)
files.sort()
for f in files:
split_name = os.path.splitext(f)
if (split_name[1].lower() in ['.mp4', '.mkv', '.avi', '.mov']):
@@ -202,7 +203,7 @@ class ShadersMenu(Menu):
root, dirs, files = next(os.walk(current_path))
indent = ' ' * 4 * (current_level)
for folder in dirs:
for folder in sorted(dirs):
is_open, char = self._check_folder_state(folder)
self.menu_list.append(dict(name='{}{}{}'.format(indent, folder, char), is_shader=False))
if (is_open):
@@ -210,6 +211,7 @@ class ShadersMenu(Menu):
next_level = current_level + 1
self._add_folder_to_shaders_list(next_path, next_level)
files.sort()
for f in files:
split_name = os.path.splitext(f)
if (split_name[1].lower() in ['.frag', '.shader', '.glsl', '.glslf', '.fsh']):