summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/widget/wpushbutton.cpp95
-rw-r--r--src/widget/wpushbutton.h33
2 files changed, 76 insertions, 52 deletions
diff --git a/src/widget/wpushbutton.cpp b/src/widget/wpushbutton.cpp
index fb145e9a6b..571e5c3765 100644
--- a/src/widget/wpushbutton.cpp
+++ b/src/widget/wpushbutton.cpp
@@ -31,30 +31,27 @@
const int PB_SHORTKLICKTIME = 200;
-WPushButton::WPushButton(QWidget* parent)
- : WWidget(parent),
+WPushButton::WPushButton(QWidget* pParent)
+ : WWidget(pParent),
m_bLeftClickForcePush(false),
m_bRightClickForcePush(false),
- m_pPixmaps(NULL),
+ m_bPressed(false),
m_leftButtonMode(ControlPushButton::PUSH),
m_rightButtonMode(ControlPushButton::PUSH) {
setStates(0);
- //setBackgroundMode(Qt::NoBackground); //obsolete? removal doesn't seem to change anything on the GUI --kousu 2009/03
}
-WPushButton::WPushButton(QWidget *parent, ControlPushButton::ButtonMode leftButtonMode,
+WPushButton::WPushButton(QWidget* pParent, ControlPushButton::ButtonMode leftButtonMode,
ControlPushButton::ButtonMode rightButtonMode)
- : WWidget(parent),
+ : WWidget(pParent),
m_bLeftClickForcePush(false),
m_bRightClickForcePush(false),
- m_pPixmaps(NULL),
m_leftButtonMode(leftButtonMode),
m_rightButtonMode(rightButtonMode) {
setStates(0);
}
WPushButton::~WPushButton() {
- delete [] m_pPixmaps;
}
void WPushButton::setup(QDomNode node) {
@@ -71,8 +68,10 @@ void WPushButton::setup(QDomNode node) {
QDomNode state = selectNode(node, "State");
while (!state.isNull()) {
if (state.isElement() && state.nodeName() == "State") {
- setPixmap(selectNodeInt(state, "Number"), true, getPath(selectNodeQString(state, "Pressed")));
- setPixmap(selectNodeInt(state, "Number"), false, getPath(selectNodeQString(state, "Unpressed")));
+ setPixmap(selectNodeInt(state, "Number"), true,
+ getPath(selectNodeQString(state, "Pressed")));
+ setPixmap(selectNodeInt(state, "Number"), false,
+ getPath(selectNodeQString(state, "Unpressed")));
}
state = state.nextSibling();
}
@@ -83,7 +82,6 @@ void WPushButton::setup(QDomNode node) {
m_bRightClickForcePush = selectNodeQString(node, "RightClickIsPushButton")
.contains("true", Qt::CaseInsensitive);
-
QDomNode con = selectNode(node, "Connection");
while (!con.isNull()) {
// Get ConfigKey
@@ -124,38 +122,46 @@ void WPushButton::setup(QDomNode node) {
}
void WPushButton::setStates(int iStates) {
- m_iNoStates = iStates;
m_value = 0.;
m_bPressed = false;
+ m_iNoStates = 0;
- // If pixmap array is already allocated, delete it
- delete [] m_pPixmaps;
- m_pPixmaps = NULL;
+ // Clear existing pixmaps.
+ m_pressedPixmaps.resize(0);
+ m_unpressedPixmaps.resize(0);
if (iStates > 0) {
- m_pPixmaps = new QPixmapPointer[2 * m_iNoStates];
- // No need to clear each pointer since the QSharedPointer constructor
- // clears them.
+ m_iNoStates = iStates;
+ m_pressedPixmaps.resize(iStates);
+ m_unpressedPixmaps.resize(iStates);
}
}
void WPushButton::setPixmap(int iState, bool bPressed, const QString &filename) {
- int pixIdx = (iState * 2) + (bPressed ? 1 : 0);
- if (pixIdx < 2 * m_iNoStates) {
- m_pPixmaps[pixIdx] = WPixmapStore::getPixmap(filename);
- if (!m_pPixmaps[pixIdx]) {
- qDebug() << "WPushButton: Error loading pixmap:" << filename;
- } else {
- // Set size of widget equal to pixmap size
- setFixedSize(m_pPixmaps[pixIdx]->size());
- }
+
+ QVector<QPixmapPointer>& pixmaps = bPressed ?
+ m_pressedPixmaps : m_unpressedPixmaps;
+
+ if (iState < 0 || iState >= pixmaps.size()) {
+ return;
+ }
+
+ QPixmapPointer pPixmap = WPixmapStore::getPixmap(filename);
+
+ if (pPixmap.isNull() || pPixmap->isNull()) {
+ qDebug() << "WPushButton: Error loading pixmap:" << filename;
+ } else {
+ pixmaps[iState] = pPixmap;
+
+ // Set size of widget equal to pixmap size
+ setFixedSize(pPixmap->size());
}
}
void WPushButton::setPixmapBackground(const QString &filename) {
// Load background pixmap
m_pPixmapBack = WPixmapStore::getPixmap(filename);
- if (!m_pPixmapBack) {
+ if (m_pPixmapBack.isNull() || m_pPixmapBack->isNull()) {
qDebug() << "WPushButton: Error loading background pixmap:" << filename;
}
}
@@ -164,7 +170,7 @@ void WPushButton::setValue(double v) {
m_value = v;
if (m_iNoStates == 1) {
- if (m_value == 1.) {
+ if (m_value == 1.0) {
m_bPressed = true;
} else {
m_bPressed = false;
@@ -175,15 +181,28 @@ void WPushButton::setValue(double v) {
void WPushButton::paintEvent(QPaintEvent *) {
double value = m_value;
- if (m_iNoStates > 0) {
- int idx = (((int)value % m_iNoStates) * 2) + m_bPressed;
- if (m_pPixmaps[idx]) {
- QPainter p(this);
- if (m_pPixmapBack) {
- p.drawPixmap(0, 0, *m_pPixmapBack);
- }
- p.drawPixmap(0, 0, *m_pPixmaps[idx]);
- }
+ if (m_iNoStates == 0) {
+ return;
+ }
+
+ const QVector<QPixmapPointer>& pixmaps = m_bPressed ?
+ m_pressedPixmaps : m_unpressedPixmaps;
+
+ int idx = static_cast<int>(value) % m_iNoStates;
+
+ // Just in case m_iNoStates is somehow different from pixmaps.size().
+ if (idx < 0 || idx >= pixmaps.size()) {
+ return;
+ }
+
+ QPainter p(this);
+ if (m_pPixmapBack) {
+ p.drawPixmap(0, 0, *m_pPixmapBack);
+ }
+
+ QPixmapPointer pPixmap = pixmaps[idx];
+ if (!pPixmap.isNull() && !pPixmap->isNull()) {
+ p.drawPixmap(0, 0, *pPixmap);
}
}
diff --git a/src/widget/wpushbutton.h b/src/widget/wpushbutton.h
index 2384372b37..42c7aea929 100644
--- a/src/widget/wpushbutton.h
+++ b/src/widget/wpushbutton.h
@@ -25,6 +25,7 @@
#include <QMouseEvent>
#include <QFocusEvent>
#include <QTimer>
+#include <QVector>
#include "widget/wwidget.h"
#include "widget/wpixmapstore.h"
@@ -33,9 +34,9 @@
class WPushButton : public WWidget {
Q_OBJECT
public:
- WPushButton(QWidget *parent=0);
+ WPushButton(QWidget* pParent=NULL);
// Used by WPushButtonTest.
- WPushButton(QWidget *parent, ControlPushButton::ButtonMode leftButtonMode,
+ WPushButton(QWidget* pParent, ControlPushButton::ButtonMode leftButtonMode,
ControlPushButton::ButtonMode rightButtonMode);
virtual ~WPushButton();
@@ -45,13 +46,6 @@ class WPushButton : public WWidget {
// associated pixmaps.
void setStates(int iStatesW);
- // Associates a pixmap of a given state of the button with the widget
- void setPixmap(int iState, bool bPressed, const QString &filename);
-
- // Associates a background pixmap with the widget. This is only needed if
- // the button pixmaps contains alpha channel values.
- void setPixmapBackground(const QString &filename);
-
public slots:
void setValue(double);
@@ -61,17 +55,28 @@ class WPushButton : public WWidget {
virtual void mouseReleaseEvent(QMouseEvent *e);
virtual void focusOutEvent(QFocusEvent* e);
+ private:
+ // Associates a pixmap of a given state of the button with the widget
+ void setPixmap(int iState, bool bPressed, const QString &filename);
+
+ // Associates a background pixmap with the widget. This is only needed if
+ // the button pixmaps contains alpha channel values.
+ void setPixmapBackground(const QString &filename);
+
+ bool m_bLeftClickForcePush;
+ bool m_bRightClickForcePush;
+
// True, if the button is currently pressed
bool m_bPressed;
- private:
- bool m_bLeftClickForcePush, m_bRightClickForcePush;
- // Number of states associated with this button
- int m_iNoStates;
// Array of associated pixmaps
- QPixmapPointer* m_pPixmaps;
+ int m_iNoStates;
+ QVector<QPixmapPointer> m_pressedPixmaps;
+ QVector<QPixmapPointer> m_unpressedPixmaps;
+
// Associated background pixmap
QPixmapPointer m_pPixmapBack;
+
// short click toggle button long click push button
ControlPushButton::ButtonMode m_leftButtonMode;
ControlPushButton::ButtonMode m_rightButtonMode;
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-27 11:31:56 +0000