Browse Source

Merge pull request #1252 from DonLakeFlyer/SetupViewResize

Resize setup view to fill space available
QGC4.4
Don Gagne 10 years ago
parent
commit
d84e7c945d
  1. 2
      src/VehicleSetup/SetupView.cc
  2. 36
      src/VehicleSetup/SetupView.ui
  3. 2
      src/ui/px4_configuration/PX4RCCalibration.ui
  4. 2
      src/ui/px4_configuration/QGCPX4AirframeConfig.ui

2
src/VehicleSetup/SetupView.cc

@ -110,7 +110,7 @@ void SetupView::_changeSetupWidget(QWidget* newWidget) @@ -110,7 +110,7 @@ void SetupView::_changeSetupWidget(QWidget* newWidget)
delete _currentSetupWidget;
}
_currentSetupWidget = newWidget;
_ui->setupWidgetLayout->addWidget(newWidget);
_ui->horizontalLayout->addWidget(newWidget);
}
void SetupView::firmwareButtonClicked(void)

36
src/VehicleSetup/SetupView.ui

@ -39,42 +39,6 @@ @@ -39,42 +39,6 @@
</property>
</widget>
</item>
<item>
<widget class="QWidget" name="setupWidget">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
<height>300</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<property name="autoFillBackground">
<bool>true</bool>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<layout class="QVBoxLayout" name="setupWidgetLayout"/>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<customwidgets>

2
src/ui/px4_configuration/PX4RCCalibration.ui

@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>

2
src/ui/px4_configuration/QGCPX4AirframeConfig.ui

@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>

Loading…
Cancel
Save