Skip to content

Add Connecting Animation with "Grow" Animation#280

Merged
hebasto merged 4 commits into
bitcoin-core:mainfrom
johnny9:connection-animation-grow
Mar 14, 2023
Merged

Add Connecting Animation with "Grow" Animation#280
hebasto merged 4 commits into
bitcoin-core:mainfrom
johnny9:connection-animation-grow

Conversation

@johnny9
Copy link
Copy Markdown
Collaborator

@johnny9 johnny9 commented Mar 5, 2023

Windows
Intel macOS
Apple Silicon macOS
ARM64 Android

@johnny9
Copy link
Copy Markdown
Collaborator Author

johnny9 commented Mar 5, 2023

From connecting to syncing:
Screencast from 03-04-23 21:57:10.webm

From connecting to blocks:
Screencast from 03-04-23 21:57:54.webm

Copy link
Copy Markdown
Contributor

@jarolrod jarolrod left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We can make this the only PR adding all the logic for the connection animation, so #272 can be closed, and everything kept in here

Comment thread src/qml/components/blockclockdial.cpp
@johnny9 johnny9 force-pushed the connection-animation-grow branch from 30049ba to 14c8e1c Compare March 10, 2023 04:49
@johnny9 johnny9 force-pushed the connection-animation-grow branch from 14c8e1c to 31d506f Compare March 10, 2023 04:51
@johnny9
Copy link
Copy Markdown
Collaborator Author

johnny9 commented Mar 10, 2023

Update to 31d506f:

@johnny9
Copy link
Copy Markdown
Collaborator Author

johnny9 commented Mar 10, 2023

Signet sync with easing:
Screencast from 03-10-23 09:48:52.webm

this, [=]() {
if (m_is_connected
&& getTargetAnimationAngle() - m_animating_max_angle < 1) {
m_animation_timer.stop();
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The connecting animation seems to only be playing once and then won't play again on subsequent scenarios where we are trying to connect. I think because there's nothing starting this timer again?

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah that's likely correct. Ill have another look at the stopping condition here.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NVM not seeing this issue any more, am on plane wifi, maybe it was acting up somehow

Copy link
Copy Markdown
Contributor

@jarolrod jarolrod left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 31d506f

@hebasto hebasto merged commit 5a68308 into bitcoin-core:main Mar 14, 2023
johnny9 pushed a commit to johnny9/bitcoin-core-app that referenced this pull request Jul 4, 2025
…Animation

ec7b96b qml: add easing to BlockClockDial grow animations (johnny9)
b8075f2 qml: add "grow" animation to the blockclockdial (johnny9)
97e1921 qml: Add timer to control BlockClockDial connecting animation (johnny9)
564e45e qml: Add connection animation to block clock (jarolrod)

Pull request description:

  [![Windows](https://img.shields.io/badge/OS-Windows-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/win64/insecure_win_gui.zip?branch=pull/280)
  [![Intel macOS](https://img.shields.io/badge/OS-Intel%20macOS-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/macos/insecure_mac_gui.zip?branch=pull/280)
  [![Apple Silicon macOS](https://img.shields.io/badge/OS-Apple%20Silicon%20macOS-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/macos_arm64/insecure_mac_arm64_gui.zip?branch=pull/280)
  [![ARM64 Android](https://img.shields.io/badge/OS-Android-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/android/insecure_android_apk.zip?branch=pull/280)

ACKs for top commit:
  jarolrod:
    ACK ec7b96b

Tree-SHA512: bc8fc53d09a684e2d56fd15b347a88aee048ae5c5578c36e51fc0d40a9f5efb5e5c3014ac52f77c8408ac897520d2d3832aad53451246a2fbccdf16b97a045d6
tx-signer450 added a commit to tx-signer450/gui-qml that referenced this pull request Oct 20, 2025
…Animation

ec7b96bd26ae8031b936ea9400afd7e65b5c9ef4 qml: add easing to BlockClockDial grow animations (johnny9)
b8075f2dffa0183c66f747e31ee34f93fe38bd75 qml: add "grow" animation to the blockclockdial (johnny9)
97e1921896e28456cc446f072fd1c3cb6b15590b qml: Add timer to control BlockClockDial connecting animation (johnny9)
564e45eb496f809d0935af5a09634462307e443d qml: Add connection animation to block clock (jarolrod)

Pull request description:

  [![Windows](https://img.shields.io/badge/OS-Windows-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/win64/insecure_win_gui.zip?branch=pull/280)
  [![Intel macOS](https://img.shields.io/badge/OS-Intel%20macOS-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/macos/insecure_mac_gui.zip?branch=pull/280)
  [![Apple Silicon macOS](https://img.shields.io/badge/OS-Apple%20Silicon%20macOS-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/macos_arm64/insecure_mac_arm64_gui.zip?branch=pull/280)
  [![ARM64 Android](https://img.shields.io/badge/OS-Android-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/android/insecure_android_apk.zip?branch=pull/280)

ACKs for top commit:
  jarolrod:
    ACK ec7b96bd26ae8031b936ea9400afd7e65b5c9ef4

Tree-SHA512: bc8fc53d09a684e2d56fd15b347a88aee048ae5c5578c36e51fc0d40a9f5efb5e5c3014ac52f77c8408ac897520d2d3832aad53451246a2fbccdf16b97a045d6
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants