Skip to content

Commit f889657

Browse files
AppStore app: also refresh focus group
1 parent cb95348 commit f889657

File tree

2 files changed

+15
-17
lines changed

2 files changed

+15
-17
lines changed

internal_filesystem/builtin/apps/com.micropythonos.appstore/assets/appstore.py

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ class AppStore(Activity):
3838

3939
# Widgets:
4040
main_screen = None
41+
app_list = None
4142
update_button = None
4243
install_button = None
4344
install_label = None
@@ -146,16 +147,25 @@ async def download_app_index(self, json_url):
146147

147148
def create_apps_list(self):
148149
print("create_apps_list")
150+
149151
print("Hiding please wait label...")
150152
self.please_wait_label.add_flag(lv.obj.FLAG.HIDDEN)
151-
apps_list = lv.list(self.main_screen)
152-
self._apply_default_styles(apps_list)
153-
apps_list.set_size(lv.pct(100), lv.pct(100))
153+
154+
print("Emptying focus group")
155+
# removing objects or even cleaning the screen doesn't seem to empty the focus group
156+
focusgroup = lv.group_get_default()
157+
if focusgroup:
158+
focusgroup.remove_all_objs()
159+
focusgroup.add_obj(self.settings_button)
160+
161+
self.apps_list = lv.list(self.main_screen)
162+
self._apply_default_styles(self.apps_list)
163+
self.apps_list.set_size(lv.pct(100), lv.pct(100))
154164
self._icon_widgets = {} # Clear old icons
155165
print("create_apps_list iterating")
156166
for app in self.apps:
157167
print(app)
158-
item = apps_list.add_button(None, "")
168+
item = self.apps_list.add_button(None, "")
159169
item.set_style_pad_all(0, 0)
160170
item.set_size(lv.pct(100), lv.SIZE_CONTENT)
161171
self._add_click_handler(item, self.show_app_detail, app)

internal_filesystem/lib/mpos/ui/focus_direction.py

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -144,18 +144,6 @@ def process_object(obj, depth=0):
144144

145145
return closest_obj
146146

147-
148-
149-
150-
151-
152-
153-
154-
155-
156-
157-
158-
159147
# This function is missing so emulate it using focus_next():
160148
def emulate_focus_obj(focusgroup, target):
161149
if not focusgroup:
@@ -168,7 +156,7 @@ def emulate_focus_obj(focusgroup, target):
168156
currently_focused = focusgroup.get_focused()
169157
#print ("emulate_focus_obj: currently focused:") ; mpos.util.print_lvgl_widget(currently_focused)
170158
if currently_focused is target:
171-
print("emulate_focus_obj: found target, stopping")
159+
#print("emulate_focus_obj: found target, stopping")
172160
return
173161
else:
174162
focusgroup.focus_next()

0 commit comments

Comments
 (0)