Skip to content

Conversation

@promag
Copy link
Contributor

@promag promag commented Dec 30, 2018

Backport #14123 #14133 #14383 and #14597 to 0.17 branch to fix #13606 (comment).

promag and others added 8 commits December 30, 2018 00:19
Qt `setWindowIcon()` does this work.

Github-Pull: bitcoin#14597
Rebased-From: 53bb6be
This moves the Dock icon click reaction code to the common place and
allows some cleanup in obj_c code.

According to the Apple's docs `class_replaceMethod` behaves as
`class_addMethod`, if the method identified by name does not yet exist;
or as `method_setImplementation`, if it does exist.

Github-Pull: bitcoin#14597
Rebased-From: 2464925
Qt `setAsDockMenu()` does this work.

Github-Pull: bitcoin#14597
Rebased-From: 6b1d297
@fanquake fanquake added this to the 0.17.2 milestone Dec 30, 2018
@maflcko maflcko changed the title 0.17: Backport #14123 #14133 #14383 #14597 0.17: GUI Backports #14123 #14133 #14383 #14597 Dec 30, 2018
@maflcko maflcko added the GUI label Dec 30, 2018
@fanquake
Copy link
Member

fanquake commented Jan 2, 2019

Tested on macOS 10.14.2 (qt 5.12.0) on top of 16521ce.
Note that 27beb83 differs from it's rebased-from commit 0a656f8.

Checked that the dock icon appears correctly.
Checked that it's using the native show/hide controls.
Checked that #13829 doesn't occur.
Tested that passing -disablewallet modifies the dock menu as expected i.e:
screen shot 2019-01-02 at 9 20 15 pm

@promag
Copy link
Contributor Author

promag commented Jan 2, 2019

Thanks @fanquake, I think that's it.

@laanwj
Copy link
Member

laanwj commented Jan 2, 2019

utACK 27beb83

@hebasto
Copy link
Member

hebasto commented Jan 2, 2019

tACK 27beb83 (Linux Mint 19.2, macOS 10.13.6).

@laanwj laanwj merged commit 27beb83 into bitcoin:0.17 Jan 3, 2019
laanwj added a commit that referenced this pull request Jan 3, 2019
27beb83 qt: All tray menu actions call showNormalIfMinimized (João Barbosa)
c470bbd qt: Use GUIUtil::bringToFront where possible (João Barbosa)
ac73c7d qt: Add GUIUtil::bringToFront (João Barbosa)
0c2fb87 Remove obj_c for macOS Dock icon menu (Hennadii Stepanov)
9034714 Use Qt signal for macOS Dock icon click event (Hennadii Stepanov)
4d4bc37 Remove obj_c for macOS Dock icon setting (Hennadii Stepanov)
d2ed162 Clean systray icon menu for -disablewallet mode (Hennadii Stepanov)
298dc15 gui: Favor macOS show / hide action in dock menu (João Barbosa)

Pull request description:

  Backport #14123 #14133 #14383 and #14597 to 0.17 branch to fix #13606 (comment).

Tree-SHA512: 543c80e7e2130870e801e0c9a69b06b9eea27c288478fc5dddeb662f7f3ec5b56b30916e5a9a629fced3fffcb8be77e2cd155e75cfd0a4392299add9730840f4
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Dec 16, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants