Browse Source

Change of Text sizing in QuickView, to allow for smoother resizing

QGC4.4
Michael Carpenter 12 years ago
parent
commit
3a3085ad1d
  1. 2
      src/ui/uas/UASQuickViewItemSelect.cc
  2. 8
      src/ui/uas/UASQuickViewTextItem.cc
  3. 2
      src/ui/uas/UASQuickViewTextItem.h

2
src/ui/uas/UASQuickViewItemSelect.cc

@ -6,6 +6,8 @@ UASQuickViewItemSelect::UASQuickViewItemSelect(QWidget *parent) : QWidget(parent
ui.setupUi(this); ui.setupUi(this);
currcol = 0; currcol = 0;
currrow = 0; currrow = 0;
ui.gridLayout->setSpacing(0);
ui.gridLayout->setMargin(0);
} }
void UASQuickViewItemSelect::addItem(QString item,bool enabled) void UASQuickViewItemSelect::addItem(QString item,bool enabled)
{ {

8
src/ui/uas/UASQuickViewTextItem.cc

@ -9,14 +9,15 @@ UASQuickViewTextItem::UASQuickViewTextItem(QWidget *parent) : UASQuickViewItem(p
layout->setMargin(0); layout->setMargin(0);
titleLabel = new QLabel(this); titleLabel = new QLabel(this);
titleLabel->setSizePolicy(QSizePolicy::Ignored,QSizePolicy::Ignored); titleLabel->setSizePolicy(QSizePolicy::Ignored,QSizePolicy::Ignored);
titleLabel->setAlignment(Qt::AlignHCenter); titleLabel->setAlignment(Qt::AlignHCenter | Qt::AlignBottom);
this->layout()->addWidget(titleLabel); this->layout()->addWidget(titleLabel);
valueLabel = new QLabel(this); valueLabel = new QLabel(this);
valueLabel->setSizePolicy(QSizePolicy::Ignored,QSizePolicy::Ignored); valueLabel->setSizePolicy(QSizePolicy::Ignored,QSizePolicy::Ignored);
valueLabel->setAlignment(Qt::AlignHCenter); valueLabel->setAlignment(Qt::AlignHCenter | Qt::AlignTop);
valueLabel->setText("0.00"); valueLabel->setText("0.00");
this->layout()->addWidget(valueLabel); this->layout()->addWidget(valueLabel);
layout->addSpacerItem(new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Ignored)); //spacerItem = new QSpacerItem(20,40,QSizePolicy::Minimum,QSizePolicy::Ignored);
//layout->addSpacerItem(spacerItem);
QFont valuefont = valueLabel->font(); QFont valuefont = valueLabel->font();
QFont titlefont = titleLabel->font(); QFont titlefont = titleLabel->font();
valuefont.setPixelSize(this->height() / 2.0); valuefont.setPixelSize(this->height() / 2.0);
@ -39,6 +40,7 @@ void UASQuickViewTextItem::resizeEvent(QResizeEvent *event)
QFont titlefont = titleLabel->font(); QFont titlefont = titleLabel->font();
valuefont.setPixelSize(this->height()); valuefont.setPixelSize(this->height());
titlefont.setPixelSize(valuefont.pixelSize() / 2.0); titlefont.setPixelSize(valuefont.pixelSize() / 2.0);
//spacerItem->setGeometry(QRect(0,0,20,this->height()/10.0));
QFontMetrics metrics(valuefont); QFontMetrics metrics(valuefont);
//valuefont.setPixelSize(this->height() / 2.0); //valuefont.setPixelSize(this->height() / 2.0);

2
src/ui/uas/UASQuickViewTextItem.h

@ -3,6 +3,7 @@
#include "UASQuickViewItem.h" #include "UASQuickViewItem.h"
#include <QLabel> #include <QLabel>
#include <QSpacerItem>
class UASQuickViewTextItem : public UASQuickViewItem class UASQuickViewTextItem : public UASQuickViewItem
{ {
public: public:
@ -14,6 +15,7 @@ protected:
private: private:
QLabel *titleLabel; QLabel *titleLabel;
QLabel *valueLabel; QLabel *valueLabel;
QSpacerItem *spacerItem;
}; };
#endif // UASQUICKVIEWTEXTITEM_H #endif // UASQUICKVIEWTEXTITEM_H

Loading…
Cancel
Save