[0.21] gui: Backports for 0.21.2 #22427

pull hebasto wants to merge 3 commits into bitcoin:0.21 from hebasto:210711-21.2-gui-backports changing 2 files +14 −12

hebasto commented at 9:14 am on July 11, 2021: member

Backports https://github.com/bitcoin-core/gui/pull/277, https://github.com/bitcoin-core/gui/pull/365.

qt: Do not use QClipboard::Selection on Windows and macOS.

Windows and macOS do not support the global mouse selection.

Github-Pull: bitcoin-core/gui#277
Rebased-From: 7f3a5980c1d54988a707b961fd2ef647cebb4c5b

f220368220

qt: Do not extend recent transaction width to address/label string

Github-Pull: bitcoin-core/gui#365
Rebased-From: 9ea1da6fc91e17bdaa722001b97aadf576f07f65

6ca54ce2ae

qt: Draw "eye" sign at the beginning of watch-only addresses

Github-Pull: bitcoin-core/gui#365
Rebased-From: cd46c11577a05f3dc9eac94f27a6985f6ba0509e

e3f1da4bf3

hebasto added this to the milestone 0.21.2 on Jul 11, 2021
hebasto added the label Backport on Jul 11, 2021
hebasto added the label GUI on Jul 11, 2021
jarolrod commented at 2:48 am on July 15, 2021: member
ACK e3f1da4bf3db120cc691a844d612fbc522f11fb9

I performed my own backport here: https://github.com/jarolrod/bitcoin/tree/pr22427-check My backport and this PR are a zero-diff. Tested on Linux, macOS, and Windows.

Notes on Backport Commits:
- Cherry picking 7f3a5980c1d54988a707b961fd2ef647cebb4c5b on top of 0.21 does not involve any conflicts. Easy to verify that the cherry pick is correct because we are only making changes inside of the setClipboard function
- Cherry picking 9ea1da6fc91e17bdaa722001b97aadf576f07f65 also involves no conflict and commit is properly cherry-picked.
- Cherry picking cd46c11577a05f3dc9eac94f27a6985f6ba0509e involves a conflict with placement and with 0.21 not having 97a6b5e06a532a4ee029c8ba59c3438369f8b049. The conflict is properly resolved and the commit is properly cherry-picked
Testing Notes:
- #277 Backport Functionality
  
  Background: #277 was made to fix issue #258. The issue outlined that copying something to the clipboard would result in the log getting filled with the following: GUI: Data set on unsupported clipboard mode. QMimeData object will be deleted.. #277 fixed this by applying the following note from the Qt docs: QClipboard - Note for Windows and macOS USers.
  
  Testing: I have confirmed that the backport maintains the intended functionality by checking that there are no log entries for this warning on Windows and macOS. The log entries are comfirmed to be there when building of the current 0.21 branch.
- #365 Backport Functionality
  
  Background: #365 improved UI for watch only transactions by drawing it at the beginning of a watch-only address on the overview page. Additionally, this PR fixed issue #373. The issue showed how the GUI page would expand to the size of the list of addresses involved with a recent transaction shown on the overview page. The GUI window could then not be resized to be smaller. #365 fixed this issue by no longer bounding to address_rect_min_width. We were bounding to this width in order to show the watch only icon which was previously shown at the end of the address list. Now that it is being shown at the start of the address list, we don’t need to bound to this.
  
  Testing: I have confirmed that the backport maintains the intended functionality by following th same testing procedure as I did here: https://github.com/bitcoin-core/gui/pull/365#pullrequestreview-685895788
laanwj referenced this in commit 964ca3b912 on Jul 21, 2021
fanquake approved
fanquake commented at 3:20 am on July 29, 2021: member

ACK e3f1da4bf3db120cc691a844d612fbc522f11fb9
fanquake merged this on Jul 29, 2021
fanquake closed this on Jul 29, 2021
hebasto deleted the branch on Jul 29, 2021
ComputerCraftr referenced this in commit 92a0234680 on Aug 18, 2021
tcharding referenced this in commit 433ac6fcef on Jul 22, 2022
tcharding referenced this in commit 60a2417a8f on Aug 3, 2022
DrahtBot locked this on Aug 19, 2022

Contributors
hebasto jarolrod fanquake

Labels
GUI Backport

Milestone
0.21.2