fixed checkbox in linux

This commit is contained in:
John Preston 2014-12-05 06:01:16 -08:00
parent e91f93bfed
commit 9048dd7fc4

View file

@ -27,7 +27,7 @@ FlatCheckbox::FlatCheckbox(QWidget *parent, const QString &text, bool checked, c
connect(this, SIGNAL(stateChanged(int, ButtonStateChangeSource)), this, SLOT(onStateChange(int, ButtonStateChangeSource))); connect(this, SIGNAL(stateChanged(int, ButtonStateChangeSource)), this, SLOT(onStateChange(int, ButtonStateChangeSource)));
setCursor(_st.cursor); setCursor(_st.cursor);
int32 w = _st.width, h = _st.height; int32 w = _st.width, h = _st.height;
if (w <= 0) w = _st.textLeft + _st.font->m.width(_text) + 1; if (w <= 0) w = _st.textLeft + _st.font->m.width(_text) + 2;
if (h <= 0) h = qMax(_st.font->height, _st.imageRect.pxHeight()); if (h <= 0) h = qMax(_st.font->height, _st.imageRect.pxHeight());
resize(QSize(w, h)); resize(QSize(w, h));
} }
@ -87,7 +87,7 @@ void FlatCheckbox::paintEvent(QPaintEvent *e) {
tRect.setTop(_st.textTop); tRect.setTop(_st.textTop);
tRect.setLeft(_st.textLeft); tRect.setLeft(_st.textLeft);
// p.drawText(_st.textLeft, _st.textTop + _st.font->ascent, _text); // p.drawText(_st.textLeft, _st.textTop + _st.font->ascent, _text);
p.drawText(tRect, _text, QTextOption(style::al_topleft)); p.drawText(tRect, _text, QTextOption(style::al_topleft));
if (_state & StateDisabled) { if (_state & StateDisabled) {
QRect sRect(_checked ? _st.chkDisImageRect : _st.disImageRect); QRect sRect(_checked ? _st.chkDisImageRect : _st.disImageRect);