iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Create a cusrtom ComboBox - so that we can add scrollbars to pop-up of non-editrable combos with QGtkStyle

Browse Source
This commit is contained in:
craig.p.drummond
2013-02-28 22:15:02 +00:00
committed by craig.p.drummond
parent a10c7cca3e
commit 4f7c893dde
6 changed files with 152 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
support/CMakeLists.txt
View File

@@ -18,7 +18,7 @@ SET( SUPPORT_MOC_HDRS
)
if (NOT WIN32)
SET( SUPPORT_SRCS ${SUPPORT_SRCS} onoffbutton.cpp spinbox.cpp windowmanager.cpp gtkproxystyle.cpp osthumb.cpp)
SET( SUPPORT_SRCS ${SUPPORT_SRCS} onoffbutton.cpp spinbox.cpp windowmanager.cpp gtkproxystyle.cpp osthumb.cpp combobox.cpp)
SET( SUPPORT_MOC_HDRS ${SUPPORT_MOC_HDRS} spinbox.h windowmanager.h gtkproxystyle.h osthumb.h)
install(FILES ambiance.css radiance.css DESTINATION ${CMAKE_INSTALL_PREFIX}/share/${CMAKE_PROJECT_NAME}/)
endif (NOT WIN32)

98
support/combobox.cpp Normal file
View File

@@ -0,0 +1,98 @@
/*
* Cantata
*
* Copyright (c) 2011-2013 Craig Drummond <craig.p.drummond@gmail.com>
*
* ----
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
#include "combobox.h"
#include <QLineEdit>
#include <QAbstractItemView>
#include <QStyle>
#include <QStyleOption>
#include "gtkproxystyle.h"
// Max number of items before we try to force a scrollbar in popup menu...
static const int constPopupItemCount=32;
ComboBox::ComboBox(QWidget *p)
: QComboBox(p)
{
}
void ComboBox::showPopup()
{
QStyleOptionComboBox opt;
opt.init(this);
bool usingPopup=style()->styleHint(QStyle::SH_ComboBox_Popup, &opt);
// Hacky, but if we set the combobox as editable - the style gives the
// popup a scrollbar. This is more convenient if we have lots of items!
if (usingPopup && count()>constPopupItemCount) {
setMaxVisibleItems(constPopupItemCount);
setEditable(true);
lineEdit()->setReadOnly(true);
}
QComboBox::showPopup();
// Also, if the size of the popup is more than required for 32 items, then
// restrict its height...
if (usingPopup && parentWidget() && view()->parentWidget() && count()>constPopupItemCount) {
int maxHeight=constPopupItemCount*view()->sizeHintForRow(0);
QRect geo(view()->parentWidget()->geometry());
QRect r(view()->parentWidget()->rect());
if (geo.height()>maxHeight) {
geo=QRect(geo.x(), geo.y()+(geo.height()-maxHeight), geo.width(), maxHeight);
r=QRect(r.x(), r.y()+(r.height()-maxHeight), r.width(), maxHeight);
}
QPoint popupBot=view()->parentWidget()->mapToGlobal(r.bottomLeft());
QPoint bot=mapToGlobal(rect().bottomLeft());
if (popupBot.y()<bot.y()) {
geo=QRect(geo.x(), geo.y()+(bot.y()-popupBot.y()), geo.width(), geo.height());
} else {
QPoint popupTop=view()->parentWidget()->mapToGlobal(r.topLeft());
QPoint top=mapToGlobal(rect().topLeft());
if (popupTop.y()>top.y()) {
geo=QRect(geo.x(), geo.y()-(popupTop.y()-top.y()), geo.width(), geo.height());
}
}
view()->parentWidget()->setGeometry(geo);
// Hide scrollers - these look ugly...
foreach (QObject *c, view()->parentWidget()->children()) {
if (0==qstrcmp("QComboBoxPrivateScroller", c->metaObject()->className())) {
((QWidget *)c)->setMaximumHeight(0);
}
}
}
}
void ComboBox::hidePopup()
{
// Unset editable...
if (count()>constPopupItemCount) {
QStyleOptionComboBox opt;
opt.init(this);
if (style()->styleHint(QStyle::SH_ComboBox_Popup, &opt)) {
setEditable(false);
}
}
QComboBox::hidePopup();
}

44
support/combobox.h Normal file
View File

@@ -0,0 +1,44 @@
/*
* Cantata
*
* Copyright (c) 2011-2013 Craig Drummond <craig.p.drummond@gmail.com>
*
* ----
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
#ifndef COMBOBOX_H
#define COMBOBOX_H
#include <QComboBox>
#ifdef Q_OS_WIN
typedef QComboBox ComboBox;
#else
class ComboBox : public QComboBox
{
public:
ComboBox(QWidget *p);
virtual ~ComboBox() { }
private:
void showPopup();
void hidePopup();
};
#endif
#endif

7
tags/tageditor.ui
View File

@@ -27,7 +27,7 @@
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="trackName"/>
<widget class="ComboBox" name="trackName"/>
</item>
<item row="1" column="0">
<widget class="StateLabel" name="titleLabel">
@@ -151,6 +151,11 @@
<extends>QComboBox</extends>
<header>completioncombo.h</header>
</customwidget>
<customwidget>
<class>ComboBox</class>
<extends>QComboBox</extends>
<header>combobox.h</header>
</customwidget>
<customwidget>
<class>SpinBox</class>
<extends>SpinBox</extends>

67
widgets/genrecombo.cpp
View File

@@ -23,10 +23,6 @@
#include "genrecombo.h"
#include "localize.h"
#include <QLineEdit>
#include <QAbstractItemView>
#include <QStyle>
#include <QStyleOption>
#ifndef Q_OS_WIN
#include "gtkproxystyle.h"
#endif
@@ -35,7 +31,7 @@
static const int constPopupItemCount=32;
GenreCombo::GenreCombo(QWidget *p)
: QComboBox(p)
: ComboBox(p)
{
setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
update(QSet<QString>());
@@ -45,67 +41,6 @@ GenreCombo::GenreCombo(QWidget *p)
#endif
}
void GenreCombo::showPopup()
{
QStyleOptionComboBox opt;
opt.init(this);
bool usingPopup=style()->styleHint(QStyle::SH_ComboBox_Popup, &opt);
// Hacky, but if we set the combobox as editable - the style gives the
// popup a scrollbar. This is more convenient if we have lots of items!
if (usingPopup && count()>constPopupItemCount) {
setMaxVisibleItems(constPopupItemCount);
setEditable(true);
lineEdit()->setReadOnly(true);
}
QComboBox::showPopup();
// Also, if the size of the popup is more than required for 32 items, then
// restrict its height...
if (usingPopup && parentWidget() && view()->parentWidget() && count()>constPopupItemCount) {
int maxHeight=constPopupItemCount*view()->sizeHintForRow(0);
QRect geo(view()->parentWidget()->geometry());
QRect r(view()->parentWidget()->rect());
if (geo.height()>maxHeight) {
geo=QRect(geo.x(), geo.y()+(geo.height()-maxHeight), geo.width(), maxHeight);
r=QRect(r.x(), r.y()+(r.height()-maxHeight), r.width(), maxHeight);
}
QPoint popupBot=view()->parentWidget()->mapToGlobal(r.bottomLeft());
QPoint bot=mapToGlobal(rect().bottomLeft());
if (popupBot.y()<bot.y()) {
geo=QRect(geo.x(), geo.y()+(bot.y()-popupBot.y()), geo.width(), geo.height());
} else {
QPoint popupTop=view()->parentWidget()->mapToGlobal(r.topLeft());
QPoint top=mapToGlobal(rect().topLeft());
if (popupTop.y()>top.y()) {
geo=QRect(geo.x(), geo.y()-(popupTop.y()-top.y()), geo.width(), geo.height());
}
}
view()->parentWidget()->setGeometry(geo);
// Hide scrollers - these look ugly...
foreach (QObject *c, view()->parentWidget()->children()) {
if (0==qstrcmp("QComboBoxPrivateScroller", c->metaObject()->className())) {
((QWidget *)c)->setMaximumHeight(0);
}
}
}
}
void GenreCombo::hidePopup()
{
// Unset editable...
if (count()>constPopupItemCount) {
QStyleOptionComboBox opt;
opt.init(this);
if (style()->styleHint(QStyle::SH_ComboBox_Popup, &opt)) {
setEditable(false);
}
}
QComboBox::hidePopup();
}
void GenreCombo::update(const QSet<QString> &g)
{
if (count() && g==genres) {

8
widgets/genrecombo.h
View File

@@ -24,10 +24,10 @@
#ifndef GENRECOMBO_H
#define GENRECOMBO_H
#include <QComboBox>
#include "combobox.h"
#include <QSet>
class GenreCombo : public QComboBox
class GenreCombo : public ComboBox
{
Q_OBJECT
public:
@@ -39,10 +39,6 @@ public:
public Q_SLOTS:
void update(const QSet<QString> &g);
private:
void showPopup();
void hidePopup();
private:
QSet<QString> genres;
};