Browse Source

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

Also adding a constant for the font size in SensorComponent.
QGC4.4
dogmaphobic 10 years ago
parent
commit
99eb55f102
  1. 4
      src/AutoPilotPlugins/PX4/SensorsComponent.qml
  2. 3
      src/ui/toolbar/MainToolBar.cc

4
src/AutoPilotPlugins/PX4/SensorsComponent.qml

@ -57,8 +57,8 @@ QGCView { @@ -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: [

3
src/ui/toolbar/MainToolBar.cc

@ -31,6 +31,7 @@ This file is part of the QGROUNDCONTROL project @@ -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) @@ -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);

Loading…
Cancel
Save