Commit 99eb55f1 authored by dogmaphobic's avatar dogmaphobic

Adding default tool bar height as it got lost in translation.

Also adding a constant for the font size in SensorComponent.
parent 14ff1c34
......@@ -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: [
......
......@@ -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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment