mirror of
https://github.com/liberatedsystems/Sideband_CE.git
synced 2024-09-03 04:13:27 +02:00
Removed SDL2 focus workaround for Android
This commit is contained in:
parent
b5c7ac3f0d
commit
bab181ae76
@ -749,39 +749,11 @@ class SidebandApp(MDApp):
|
||||
EventLoop.window.bind(on_keyboard=self.keyboard_event)
|
||||
EventLoop.window.bind(on_key_down=self.keydown_event)
|
||||
|
||||
# This incredibly hacky hack circumvents a bug in SDL2
|
||||
# that prevents focus from being correctly released from
|
||||
# the software keyboard on Android. Without this the back
|
||||
# button/gesture does not work after the soft-keyboard has
|
||||
# appeared for the first time.
|
||||
if RNS.vendor.platformutils.is_android():
|
||||
BIND_CLASSES = ["kivymd.uix.textfield.textfield.MDTextField",]
|
||||
|
||||
for e in self.root.ids:
|
||||
te = self.root.ids[e]
|
||||
ts = str(te).split(" ")[0].replace("<", "")
|
||||
|
||||
if ts in BIND_CLASSES:
|
||||
te.bind(focus=self.android_focus_fix)
|
||||
|
||||
self.root.ids.screen_manager.app = self
|
||||
self.root.ids.app_version_info.text = "Sideband v"+__version__+" "+__variant__
|
||||
self.root.ids.nav_scrollview.effect_cls = ScrollEffect
|
||||
Clock.schedule_once(self.start_core, 0.25)
|
||||
|
||||
# Part of the focus hack fix
|
||||
def android_focus_fix(self, sender, val):
|
||||
if not val:
|
||||
@run_on_ui_thread
|
||||
def fix_back_button():
|
||||
self.sideband.setstate("flag.focusfix_pause", True)
|
||||
self.sideband.setstate("flag.focusfix_resume", True)
|
||||
activity = autoclass('org.kivy.android.PythonActivity').mActivity
|
||||
activity.onWindowFocusChanged(False)
|
||||
activity.onWindowFocusChanged(True)
|
||||
|
||||
fix_back_button()
|
||||
|
||||
def keydown_event(self, instance, keyboard, keycode, text, modifiers):
|
||||
if self.root.ids.screen_manager.current == "map_screen":
|
||||
if not (len(modifiers) > 0 and "ctrl" in modifiers):
|
||||
|
Loading…
Reference in New Issue
Block a user