hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Fix for the font of truncated sidebar items (#5714). (#5777)

Browse Source 
* Fix for the font of truncated sidebar items (#5714).

For windows platforms, retrieve the system font and set it for the FileBrowserTreeWidget. This makes sure that truncated items will use the font as non-truncated items.

* Add TODO to remove the fix when all builds use a recent enough version of qt.

* Add check on QT version and conditionally include the fix.
This commit is contained in:
DigArtRoks
2020-11-14 16:45:49 +01:00
committed by GitHub
parent 28a394413f
commit 4fb66542a0
3 changed files with 36 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/GuiApplication.h
View File

@@ -28,6 +28,7 @@
#include <QtCore/QObject>
#include "lmms_export.h"
#include "lmmsconfig.h"
class QLabel;
@@ -48,6 +49,9 @@ public:
~GuiApplication();
static GuiApplication* instance();
#ifdef LMMS_BUILD_WIN32
static QFont getWin32SystemFont();
#endif
MainWindow* mainWindow() { return m_mainWindow; }
FxMixerView* fxMixerView() { return m_fxMixerView; }

9
src/gui/FileBrowser.cpp
View File

@@ -55,8 +55,6 @@
#include "StringPairDrag.h"
#include "TextFloat.h"
enum TreeWidgetItemTypes
{
TypeFileItem = QTreeWidgetItem::UserType,
@@ -335,6 +333,13 @@ FileBrowserTreeWidget::FileBrowserTreeWidget(QWidget * parent ) :
connect( this, SIGNAL( itemExpanded( QTreeWidgetItem * ) ),
SLOT( updateDirectory( QTreeWidgetItem * ) ) );
#if QT_VERSION < QT_VERSION_CHECK(5, 12, 2) && defined LMMS_BUILD_WIN32
// Set the font for the QTreeWidget to the Windows System font to make sure that
// truncated (elided) items use the same font as non-truncated items.
// This is a workaround for this qt bug, fixed in 5.12.2: https://bugreports.qt.io/browse/QTBUG-29232
// TODO: remove this when all builds use a recent enough version of qt.
setFont( GuiApplication::getWin32SystemFont() );
#endif
}

25
src/gui/GuiApplication.cpp
View File

@@ -45,6 +45,10 @@
#include <QMessageBox>
#include <QSplashScreen>
#ifdef LMMS_BUILD_WIN32
#include <windows.h>
#endif
GuiApplication* GuiApplication::s_instance = nullptr;
GuiApplication* GuiApplication::instance()
@@ -211,3 +215,24 @@ void GuiApplication::childDestroyed(QObject *obj)
m_controllerRackView = nullptr;
}
}
#ifdef LMMS_BUILD_WIN32
/*!
* @brief Returns the Windows System font.
*/
QFont GuiApplication::getWin32SystemFont()
{
NONCLIENTMETRICS metrics = { sizeof( NONCLIENTMETRICS ) };
SystemParametersInfo( SPI_GETNONCLIENTMETRICS, sizeof( NONCLIENTMETRICS ), &metrics, 0 );
int pointSize = metrics.lfMessageFont.lfHeight;
if ( pointSize < 0 )
{
// height is in pixels, convert to points
HDC hDC = GetDC( NULL );
pointSize = MulDiv( abs( pointSize ), 72, GetDeviceCaps( hDC, LOGPIXELSY ) );
ReleaseDC( NULL, hDC );
}
return QFont( QString::fromUtf8( metrics.lfMessageFont.lfFaceName ), pointSize );
}
#endif