From 81485c4c03e94e09c70cb05f39768a6f006a0360 Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Sat, 23 Mar 2013 12:33:32 +0100 Subject: [PATCH] Fix GridView layout bug on some GTK styles. --- src/libtomahawk/playlist/GridView.cpp | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/libtomahawk/playlist/GridView.cpp b/src/libtomahawk/playlist/GridView.cpp index 81e400fa9..38a4471f0 100644 --- a/src/libtomahawk/playlist/GridView.cpp +++ b/src/libtomahawk/playlist/GridView.cpp @@ -230,12 +230,10 @@ GridView::verifySize() if ( !autoResize() || !m_model ) return; -#ifdef Q_WS_X11 -// int scrollbar = verticalScrollBar()->isVisible() ? verticalScrollBar()->width() + 16 : 0; - int scrollbar = 0; verticalScrollBar()->rect().width(); -#else int scrollbar = verticalScrollBar()->rect().width(); -#endif + + if ( rect().width() - contentsRect().width() > scrollbar ) //HACK: if the contentsRect includes the scrollbar + scrollbar = 0; //don't count it any more const int rectWidth = contentsRect().width() - scrollbar - 3; const int itemWidth = 160; @@ -272,12 +270,10 @@ GridView::layoutItems() { if ( autoFitItems() && m_model ) { -#ifdef Q_WS_X11 -// int scrollbar = verticalScrollBar()->isVisible() ? verticalScrollBar()->width() + 16 : 0; - int scrollbar = 0; verticalScrollBar()->rect().width(); -#else int scrollbar = verticalScrollBar()->rect().width(); -#endif + + if ( rect().width() - contentsRect().width() >= scrollbar ) //HACK: if the contentsRect includes the scrollbar + scrollbar = 0; //don't count it any more const int rectWidth = contentsRect().width() - scrollbar - 3; const int itemWidth = 160;