Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
99eb55f1
Commit
99eb55f1
authored
Jun 09, 2015
by
dogmaphobic
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Adding default tool bar height as it got lost in translation.
Also adding a constant for the font size in SensorComponent.
parent
14ff1c34
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
SensorsComponent.qml
src/AutoPilotPlugins/PX4/SensorsComponent.qml
+2
-2
MainToolBar.cc
src/ui/toolbar/MainToolBar.cc
+3
-0
No files found.
src/AutoPilotPlugins/PX4/SensorsComponent.qml
View file @
99eb55f1
...
...
@@ -57,8 +57,8 @@ QGCView {
// Used to pass help text to the preCalibrationDialog dialog
property
string
preCalibrationDialogHelp
readonly
property
int
sideBarH1PointSize
:
(
ScreenTools
.
defaultFontPizelSize
*
1.3
+
0.5
)
readonly
property
int
mainTextH1PointSize
:
(
ScreenTools
.
defaultFontPizelSize
*
1.5
+
0.5
)
readonly
property
int
sideBarH1PointSize
:
ScreenTools
.
mediumFontPixelSize
readonly
property
int
mainTextH1PointSize
:
ScreenTools
.
mediumFontPixelSize
// Seems to be unused
readonly
property
int
rotationColumnWidth
:
250
readonly
property
var
rotations
:
[
...
...
src/ui/toolbar/MainToolBar.cc
View file @
99eb55f1
...
...
@@ -31,6 +31,7 @@ This file is part of the QGROUNDCONTROL project
#include <QQmlEngine>
#include "MainToolBar.h"
#include "ScreenTools.h"
#include "MainWindow.h"
#include "UASMessageView.h"
#include "UASMessageHandler.h"
...
...
@@ -63,6 +64,8 @@ MainToolBar::MainToolBar(QWidget* parent)
if
(
pl
)
{
pl
->
setContentsMargins
(
0
,
0
,
0
,
0
);
}
setMinimumHeight
(
40
*
ScreenTools
::
pixelSizeFactor_s
());
setMaximumHeight
(
40
*
ScreenTools
::
pixelSizeFactor_s
());
// Tool Bar Preferences
QSettings
settings
;
settings
.
beginGroup
(
TOOL_BAR_SETTINGS_GROUP
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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