Skip to content
Snippets Groups Projects
Commit 63c44a11 authored by moon2's avatar moon2 :speech_balloon:
Browse files

Revert "audio_config: Push submenus onto the view stack"

This reverts commit 6df6c9a0.

Commit breaks changing of values.
parent 565f7022
Branches
Tags
No related merge requests found
from st3m.application import Application from st3m.application import Application
from st3m.ui.view import View, ViewTransitionDirection
import math, random, sys_display import math, random, sys_display
from st3m import settings from st3m import settings
import audio import audio
...@@ -272,8 +271,10 @@ class Drawable: ...@@ -272,8 +271,10 @@ class Drawable:
class Submenu(Drawable): class Submenu(Drawable):
def __init__(self, press): def __init__(self, press):
super().__init__(press) super().__init__(press)
self.submenu_active = False
def draw(self, ctx): def draw(self, ctx):
if self.submenu_active:
self._draw(ctx) self._draw(ctx)
def _draw(self, ctx): def _draw(self, ctx):
...@@ -564,18 +565,6 @@ class Press: ...@@ -564,18 +565,6 @@ class Press:
self.select_pressed = False self.select_pressed = False
class SubView(View):
def __init__(self, menu, app):
self.menu = menu
self.app = app
def think(self, ins, delta_ms):
self.app.think(ins, delta_ms)
def draw(self, ctx):
self.menu.draw(ctx)
class App(Application): class App(Application):
def __init__(self, app_ctx): def __init__(self, app_ctx):
super().__init__(app_ctx) super().__init__(app_ctx)
...@@ -607,6 +596,13 @@ class App(Application): ...@@ -607,6 +596,13 @@ class App(Application):
def draw(self, ctx): def draw(self, ctx):
self.ctx = ctx self.ctx = ctx
main_menu_active = True
for menu in self.menus:
menu.draw(self.ctx)
if menu.submenu_active:
main_menu_active = False
if main_menu_active:
self.draw_bg() self.draw_bg()
ctx.save() ctx.save()
ctx.rgb(*colours.GO_GREEN) ctx.rgb(*colours.GO_GREEN)
...@@ -655,12 +651,12 @@ class App(Application): ...@@ -655,12 +651,12 @@ class App(Application):
super().think(ins, delta_ms) super().think(ins, delta_ms)
for i in range(1, 10, 2): for i in range(1, 10, 2):
if self.input.captouch.petals[i].whole.pressed: if self.input.captouch.petals[i].whole.pressed:
if not self.is_active(): for menu in self.menus:
self.vm.pop() menu.submenu_active = False
if i < 5: if i < 5:
self.vm.push(SubView(self.menus[i // 2], self)) self.menus[i // 2].submenu_active = True
elif i > 5: elif i > 5:
self.vm.push(SubView(self.menus[(i // 2) - 1], self)) self.menus[(i // 2) - 1].submenu_active = True
if ( if (
self.input.buttons.app.right.pressed self.input.buttons.app.right.pressed
...@@ -674,12 +670,11 @@ class App(Application): ...@@ -674,12 +670,11 @@ class App(Application):
def on_enter(self, vm): def on_enter(self, vm):
super().on_enter(vm) super().on_enter(vm)
if self.vm.direction == ViewTransitionDirection.FORWARD:
settings.load_all() settings.load_all()
def on_exit(self): def on_exit(self):
if self.vm.direction == ViewTransitionDirection.BACKWARD:
settings.save_all() settings.save_all()
super().on_exit()
if __name__ == "__main__": if __name__ == "__main__":
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment