qt: fix unicode character display on OSX 10.9 when building with 10.7 sdk #4643

pull theuni wants to merge 1 commits into bitcoin:master from theuni:osx-fix-unicode-fonts changing 3 files +34 −0

theuni commented at 7:09 PM on August 6, 2014: member

See comment for detailed info.

in src/qt/bitcoin.cpp:None in 3f1dddc321 outdated

 167 | +// Solution: If building with the 10.7 SDK or lower and the user's platform
 168 | +// is 10.9 or higher at runtime, substitute the correct font. This needs to
 169 | +// happen before the QApplication is created.
 170 | +#if defined(MAC_OS_X_VERSION_MAX_ALLOWED) && MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_8
 171 | +    if (floor(NSAppKitVersionNumber) >= NSAppKitVersionNumber10_9)
 172 | +      QFont::insertSubstitution(".Lucida Grande UI", "Lucida Grande");

Diapolo commented at 8:21 PM on August 6, 2014:

Nit: Indentation

theuni commented at 10:05 PM on August 6, 2014: member

@Diapolo Fixed your nit, thanks for catching.
theuni commented at 1:55 AM on August 7, 2014: member

Worth mentioning: This likely hasn't been spotted yet because it requires building on an old mac and running on a new one. But since that's how releases are done, it would surely be noticed eventually.

The unicode characters in question are the thin spaces brought in by 7007402956579ace12d45cdcfae908802d3d6b6d .
laanwj commented at 6:36 AM on August 7, 2014: member

Seems like a good solution, untested ACK
laanwj commented at 6:37 AM on August 7, 2014: member

Nit: I'd prefer if you'd moved the SubstituteFonts function and everything that comes with it to guiutil.cpp.
laanwj added the label Mac on Aug 7, 2014
theuni commented at 3:42 PM on August 7, 2014: member

Will do.
qt: fix unicode character display on osx when building with 10.7 sdk 292cc072f3
theuni commented at 4:36 PM on August 7, 2014: member

moved and rebased.
BitcoinPullTester commented at 4:48 PM on August 7, 2014: none

Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/p4643_292cc072f3bada256bc6af9970512eb9dec8d93a/ for binaries and test log. This test script verifies pulls every time they are updated. It, however, dies sometimes and fails to test properly. If you are waiting on a test, please check timestamps to verify that the test.log is moving at http://jenkins.bluematt.me/pull-tester/current/ Contact BlueMatt on freenode if something looks broken.
fanquake commented at 5:17 AM on August 8, 2014: member

ACK
laanwj merged this on Aug 8, 2014
laanwj closed this on Aug 8, 2014
laanwj referenced this in commit 2260c99f38 on Aug 8, 2014
DrahtBot locked this on Sep 8, 2021

Contributors

Labels