GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-20 23:12:21 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

Fix bottom toolbar animating on startup

Browse source 
Also fix bottom toolbar not appearing when unchecking hide mode in reviewer.
This commit is contained in:
Matthias Metelka 2023-01-16 09:16:17 +01:00
parent 84bd035dc8
commit 274914f2e1
3 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
qt/aqt/main.py
View file

@ -708,7 +708,7 @@ class AnkiQt(QMainWindow):
gui_hooks.state_will_change(state, oldState) gui_hooks.state_will_change(state, oldState)
getattr(self, f"_{state}State", lambda *_: None)(oldState, *args) getattr(self, f"_{state}State", lambda *_: None)(oldState, *args)
if state != "resetRequired": if state != "resetRequired":
self.bottomWeb.show() self.bottomWeb.adjustHeightToFit()
gui_hooks.state_did_change(state, oldState) gui_hooks.state_did_change(state, oldState)
def _deckBrowserState(self, oldState: MainWindowState) -> None: def _deckBrowserState(self, oldState: MainWindowState) -> None:

1
qt/aqt/profiles.py
View file

@ -552,6 +552,7 @@ create table if not exists profiles
def set_hide_bottom_bar(self, on: bool) -> None: def set_hide_bottom_bar(self, on: bool) -> None:
self.meta["hide_bottom_bar"] = on self.meta["hide_bottom_bar"] = on
gui_hooks.body_classes_need_update()
def bottom_bar_hide_mode(self) -> HideMode: def bottom_bar_hide_mode(self) -> HideMode:
return self.meta.get("bottom_bar_hide_mode", HideMode.FULLSCREEN) return self.meta.get("bottom_bar_hide_mode", HideMode.FULLSCREEN)

26
qt/aqt/toolbar.py
View file

@ -77,7 +77,6 @@ class TopWebView(ToolbarWebView):
def on_body_classes_need_update(self) -> None: def on_body_classes_need_update(self) -> None:
super().on_body_classes_need_update() super().on_body_classes_need_update()
self.adjustHeightToFit()
if self.mw.state == "review": if self.mw.state == "review":
if self.mw.pm.hide_top_bar(): if self.mw.pm.hide_top_bar():
@ -194,19 +193,14 @@ class BottomWebView(ToolbarWebView):
def on_body_classes_need_update(self) -> None: def on_body_classes_need_update(self) -> None:
super().on_body_classes_need_update() super().on_body_classes_need_update()
if self.mw.state == "review":
self.adjustHeightToFit()
self.show() self.show()
def _onHeight(self, qvar: Optional[int]) -> None: def animate_height(self, height: int) -> None:
self.web_height = int(qvar) self.web_height = height
if qvar is None:
self.mw.progress.single_shot(1000, self.mw.reset)
return
if self.mw.pm.reduce_motion(): if self.mw.pm.reduce_motion():
self.setFixedHeight(int(qvar)) self.setFixedHeight(height)
else: else:
# Collapse/Expand animation # Collapse/Expand animation
self.setMinimumHeight(0) self.setMinimumHeight(0)
@ -215,8 +209,8 @@ class BottomWebView(ToolbarWebView):
) )
self.animation.setDuration(int(theme_manager.var(props.TRANSITION))) self.animation.setDuration(int(theme_manager.var(props.TRANSITION)))
self.animation.setStartValue(self.height()) self.animation.setStartValue(self.height())
self.animation.setEndValue(int(qvar)) self.animation.setEndValue(height)
qconnect(self.animation.finished, lambda: self.setFixedHeight(int(qvar))) qconnect(self.animation.finished, lambda: self.setFixedHeight(height))
self.animation.start() self.animation.start()
def hide_if_allowed(self) -> None: def hide_if_allowed(self) -> None:
@ -236,12 +230,18 @@ class BottomWebView(ToolbarWebView):
def hide(self) -> None: def hide(self) -> None:
super().hide() super().hide()
self._onHeight(1) self.hidden = True
self.animate_height(1)
def show(self) -> None: def show(self) -> None:
super().show() super().show()
self.hidden = False self.hidden = False
if self.mw.state == "review":
self.evalWithCallback(
"document.documentElement.offsetHeight", self.animate_height
)
else:
self.adjustHeightToFit() self.adjustHeightToFit()