Skip to content

Conversation

@furszy
Copy link

@furszy furszy commented Apr 10, 2020

Updating MacDockIconHandler to latest upstream. Fixing #1512 .

Back ported PRs:

gui: Add GUIUtil::bringToFront 14123:

The sequence show -> raise -> activateWindow is factored out to the new function GUIUtil::bringToFront where a macOS fix is added in order to fix #13829.

Also included:

simplification of BitcoinGUI::showNormalIfMinimized

qt: Replace objc_msgSend() function calls with the native Objective-C syntax 16720:

Changes in Xcode 11 Objective-C Runtime cause an error (#16387) during building on MacOS 10.15 Catalina.

This PR fixes this issue by replacing objc_msgSend() function calls with the native Objective-C syntax.

Refs:

changes in objc_msgSend function
OBJC_OLD_DISPATCH_PROTOTYPES macro

furszy added 6 commits April 10, 2020 11:27
Qt `setWindowIcon()` does this work.

Coming from btc@53bb6be3f8a50ee9e5c4d7e9155236152e7c4b7c
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.

Coming from btc@2464925e7be832d4926b6204169bbbc1646c6368
Qt `setAsDockMenu()` does this work.

Coming from btc@6b1d2972bf9a40f97ba3a5c95831fd179b1054cf
Coming from btc@5796671e1dd8a2d0b1e750c2dce19a10af624095
Coming from btc@6fc21aca6d5e16c3ece104fec8e5b3df116893b4
Coming from btc@0bb33b5348dbddd65b88a7f00449c965562355d3
@furszy furszy self-assigned this Apr 10, 2020
@random-zebra random-zebra added Bug Build System macOS Issues/problems specifically related to macOS labels Apr 10, 2020
@random-zebra random-zebra added this to the 4.1.0 milestone Apr 10, 2020
Copy link

@random-zebra random-zebra left a comment

Choose a reason for hiding this comment

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

utACK a60b7cc

Don't have an environment to test this with, but have verified that gitian builds are fine.

Copy link
Collaborator

@Fuzzbawls Fuzzbawls left a comment

Choose a reason for hiding this comment

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

ACK a60b7cc

@furszy furszy merged commit 24bc866 into PIVX-Project:master Apr 13, 2020
random-zebra added a commit that referenced this pull request May 20, 2020
a41da9f [QT] fix opening *.conf/log files on macOS when there is no default app to open them. (furszy)

Pull request description:

  Built on top of #1515, only last commit counts for this.

  When MacOS has no default app to open *.conf and *.log throws an error instead of try to open them with a text editor. This PR solves the issue.

  Coming from btc@[16044](bitcoin#16044)

ACKs for top commit:
  random-zebra:
    utACK a41da9f
  Fuzzbawls:
    utACK a41da9f

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

Labels

Bug Build System GUI macOS Issues/problems specifically related to macOS Upstream

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants