Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
3a3085ad
Commit
3a3085ad
authored
Jun 17, 2013
by
Michael Carpenter
Browse files
Change of Text sizing in QuickView, to allow for smoother resizing
parent
da79b6ce
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/ui/uas/UASQuickViewItemSelect.cc
View file @
3a3085ad
...
@@ -6,6 +6,8 @@ UASQuickViewItemSelect::UASQuickViewItemSelect(QWidget *parent) : QWidget(parent
...
@@ -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
)
{
{
...
...
src/ui/uas/UASQuickViewTextItem.cc
View file @
3a3085ad
...
@@ -9,14 +9,15 @@ UASQuickViewTextItem::UASQuickViewTextItem(QWidget *parent) : UASQuickViewItem(p
...
@@ -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)
...
@@ -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);
...
...
src/ui/uas/UASQuickViewTextItem.h
View file @
3a3085ad
...
@@ -3,6 +3,7 @@
...
@@ -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:
...
@@ -14,6 +15,7 @@ protected:
private:
private:
QLabel
*
titleLabel
;
QLabel
*
titleLabel
;
QLabel
*
valueLabel
;
QLabel
*
valueLabel
;
QSpacerItem
*
spacerItem
;
};
};
#endif // UASQUICKVIEWTEXTITEM_H
#endif // UASQUICKVIEWTEXTITEM_H
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment